X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_params.c;h=5b00221f1a77f1c1bec0821eca2958c61f1fed53;hb=HEAD;hp=b5684b6bad465045029d2810a41383d994179246;hpb=1d50ff581be1c6fc55990ab4ef6342a3eb858930;p=openssl-gost%2Fengine.git

diff --git a/gost_params.c b/gost_params.c
index b5684b6..5b00221 100644
--- a/gost_params.c
+++ b/gost_params.c
@@ -20,7 +20,7 @@ R3410_ec_params R3410_2001_paramset[] = {
      "8000000000000000000000000000000150FE8A1892976154C59CFC193ACCF5B3",
      "2",
      "08E2A8A0E65147D4BD6316030E16D19C85C97F0A9CA267122B96ABBCEA7E8FC8",
-     "1"}
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.35.1
@@ -32,7 +32,7 @@ R3410_ec_params R3410_2001_paramset[] = {
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C611070995AD10045841B09B761B893",
      "1",
      "8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14",
-     "1"}
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.35.2
@@ -44,7 +44,7 @@ R3410_ec_params R3410_2001_paramset[] = {
      "800000000000000000000000000000015F700CFFF1A624E5E497161BCC8A198F",
      "1",
      "3FA8124359F96680B83D1C3EB2C070E5C545C9858D03ECFB744BF8D717717EFC",
-     "1"}
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.35.3
@@ -56,7 +56,7 @@ R3410_ec_params R3410_2001_paramset[] = {
      "9B9F605F5A858107AB1EC85E6B41C8AA582CA3511EDDFB74F02F3A6598980BB9",
      "0",
      "41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67",
-     "1"}
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.36.0
@@ -68,7 +68,7 @@ R3410_ec_params R3410_2001_paramset[] = {
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C611070995AD10045841B09B761B893",
      "1",
      "8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14",
-     "1"}
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.36.1
@@ -80,9 +80,28 @@ R3410_ec_params R3410_2001_paramset[] = {
      "9B9F605F5A858107AB1EC85E6B41C8AA582CA3511EDDFB74F02F3A6598980BB9",
      "0",
      "41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67",
-     "1"}
+     "1", NULL}
     ,
-    {NID_undef, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
+    /*
+     * 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", NULL}
+    ,
+    {NID_undef, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* Parameters of GOST 34.10-2012 */
@@ -108,7 +127,7 @@ R3410_ec_params R3410_2012_512_paramset[] = {
      /* y */
      "2BB312A43BD2CE6E0D020613C857ACDDCFBF061E91E5F2C3F32447C259F39B2C"
      "83AB156D77F1496BF7EB3351E1EE4E43DC1A18B91B24640B6DBB92CB1ADD371E",
-     "1"}
+     "1", NULL}
     ,
     {NID_id_tc26_gost_3410_2012_512_paramSetA,
      /* a */
@@ -128,7 +147,7 @@ R3410_ec_params R3410_2012_512_paramset[] = {
      /* y */
      "7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF16"
      "26BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4",
-     "1"}
+     "1", NULL}
     ,
     {NID_id_tc26_gost_3410_2012_512_paramSetB,
      /* a */
@@ -148,22 +167,7 @@ R3410_ec_params R3410_2012_512_paramset[] = {
      /* y */
      "1A8F7EDA389B094C2C071E3647A8940F3C123B697578C213BE6DD9E6C8EC7335"
      "DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD",
-     "1"}
-    ,
-    {NID_id_tc26_gost_3410_2012_256_paramSetA,
-     /* a */
-     "C2173F1513981673AF4892C23035A27CE25E2013BF95AA33B22C656F277E7335",
-     /* b */
-     "295F9BAE7428ED9CCC20E7C359A9D41A22FCCD9108E17BF7BA9337A6F8AE9513",
-     /* p */
-     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97",
-     /* q */
-     "400000000000000000000000000000000FD8CDDFC87B6635C115AF556C360C67",
-     /* x */
-     "91E38443A5E82C0D880923425712B2BB658B9196932E02C78B2582FE742DAA28",
-     /* y */
-     "32879423AB1A0375895786C4BB46E9565FDE0B5344766740AF268ADB32322E5C",
-     "4"}
+     "1", NULL}
     ,
     {NID_id_tc26_gost_3410_2012_512_paramSetC,
      /* a */
@@ -184,7 +188,7 @@ R3410_ec_params R3410_2012_512_paramset[] = {
      /* y */
      "F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9B"
      "E18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F",
-     "4"}
+     "4", NULL}
     ,
-    {NID_undef, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
+    {NID_undef, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
 };