X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_params.c;h=9f9806e1962b1890d513c690cdc101c5aea5c250;hb=86bfcaca3c710def42582662311fb969ded120a3;hp=799672bebf89fae5a8cfe07730e215637256490d;hpb=4c04300b7523a9e270a719dd66ac7136e899811d;p=openssl-gost%2Fengine.git

diff --git a/gost_params.c b/gost_params.c
index 799672b..9f9806e 100644
--- a/gost_params.c
+++ b/gost_params.c
@@ -82,6 +82,25 @@ R3410_ec_params R3410_2001_paramset[] = {
      "41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67",
      "1"}
     ,
+    /*
+     * 1.2.643.7.1.2.1.1.1 Edvards
+     */
+    {NID_id_tc26_gost_3410_2012_256_paramSetA,
+     /* a */
+     "C2173F1513981673AF4892C23035A27CE25E2013BF95AA33B22C656F277E7335",
+     /* b */
+     "295F9BAE7428ED9CCC20E7C359A9D41A22FCCD9108E17BF7BA9337A6F8AE9513",
+     /* p */
+     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97",
+     /* q */
+     "400000000000000000000000000000000FD8CDDFC87B6635C115AF556C360C67",
+     /* x */
+     "91E38443A5E82C0D880923425712B2BB658B9196932E02C78B2582FE742DAA28",
+     /* y */
+     "32879423AB1A0375895786C4BB46E9565FDE0B5344766740AF268ADB32322E5C",
+     /* cofactor */
+     "4"}
+    ,
     {NID_undef, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
@@ -90,6 +109,26 @@ R3410_ec_params R3410_2001_paramset[] = {
 R3410_ec_params *R3410_2012_256_paramset = R3410_2001_paramset;
 
 R3410_ec_params R3410_2012_512_paramset[] = {
+    {NID_id_tc26_gost_3410_2012_512_paramSetTest,
+     /* a */
+     "7",
+     /* b */
+     "1CFF0806A31116DA29D8CFA54E57EB748BC5F377E49400FDD788B649ECA1AC43"
+     "61834013B2AD7322480A89CA58E0CF74BC9E540C2ADD6897FAD0A3084F302ADC",
+     /* p */
+     "4531ACD1FE0023C7550D267B6B2FEE80922B14B2FFB90F04D4EB7C09B5D2D15D"
+     "F1D852741AF4704A0458047E80E4546D35B8336FAC224DD81664BBF528BE6373",
+     /* q */
+     "4531ACD1FE0023C7550D267B6B2FEE80922B14B2FFB90F04D4EB7C09B5D2D15D"
+     "A82F2D7ECB1DBAC719905C5EECC423F1D86E25EDBE23C595D644AAF187E6E6DF",
+     /* x */
+     "24D19CC64572EE30F396BF6EBBFD7A6C5213B3B3D7057CC825F91093A68CD762"
+     "FD60611262CD838DC6B60AA7EEE804E28BC849977FAC33B4B530F1B120248A9A",
+     /* y */
+     "2BB312A43BD2CE6E0D020613C857ACDDCFBF061E91E5F2C3F32447C259F39B2C"
+     "83AB156D77F1496BF7EB3351E1EE4E43DC1A18B91B24640B6DBB92CB1ADD371E",
+     "1"}
+    ,
     {NID_id_tc26_gost_3410_2012_512_paramSetA,
      /* a */
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
@@ -130,21 +169,6 @@ R3410_ec_params R3410_2012_512_paramset[] = {
      "DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD",
      "1"}
     ,
-    {NID_id_tc26_gost_3410_2012_256_paramSetA,
-     /* a */
-     "C2173F1513981673AF4892C23035A27CE25E2013BF95AA33B22C656F277E7335",
-     /* b */
-     "295F9BAE7428ED9CCC20E7C359A9D41A22FCCD9108E17BF7BA9337A6F8AE9513",
-     /* p */
-     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97",
-     /* m */
-     "01000000000000000000000000000000003F63377F21ED98D70456BD55B0D8319C",
-     /* x */
-     "91E38443A5E82C0D880923425712B2BB658B9196932E02C78B2582FE742DAA28",
-     /* y */
-     "32879423AB1A0375895786C4BB46E9565FDE0B5344766740AF268ADB32322E5C",
-     "4"}
-    ,
     {NID_id_tc26_gost_3410_2012_512_paramSetC,
      /* a */
      "DC9203E514A721875485A529D2C722FB187BC8980EB866644DE41C68E1430645"
@@ -155,9 +179,9 @@ R3410_ec_params R3410_2012_512_paramset[] = {
      /* p */
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7",
-     /* m */
-     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-     "26336E91941AAC0130CEA7FD451D40B323B6A79E9DA6849A5188F3BD1FC08FB4",
+     /* q */
+     "3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+     "C98CDBA46506AB004C33A9FF5147502CC8EDA9E7A769A12694623CEF47F023ED",
      /* x */
      "E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043A"
      "A27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148",