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

diff --git a/gost_params.c b/gost_params.c
index 2371c9a..5b00221 100644
--- a/gost_params.c
+++ b/gost_params.c
@@ -1,17 +1,17 @@
 /**********************************************************************
  *                        params.c                                    *
- *             Copyright (c) 2005-2006 Cryptocom LTD                  *
+ *             Copyright (c) 2005-2013 Cryptocom LTD                  *
  *         This file is distributed under the same license as OpenSSL *
  *                                                                    *
  * Definitions of GOST R 34.10 parameter sets, defined in RFC 4357    *
- *         OpenSSL 0.9.9 libraries required to compile and use        *
+ *         OpenSSL 1.0.0+ libraries required to compile and use       *
  *                              this code                             *
  **********************************************************************/
 #include "gost_lcl.h"
 #include <openssl/objects.h>
 /* Parameters of GOST 34.10 */
 
-R3410_2001_params R3410_2001_paramset[] = {
+R3410_ec_params R3410_2001_paramset[] = {
     /* 1.2.643.2.2.35.0 */
     {NID_id_GostR3410_2001_TestParamSet,
      "7",
@@ -19,7 +19,8 @@ R3410_2001_params R3410_2001_paramset[] = {
      "8000000000000000000000000000000000000000000000000000000000000431",
      "8000000000000000000000000000000150FE8A1892976154C59CFC193ACCF5B3",
      "2",
-     "08E2A8A0E65147D4BD6316030E16D19C85C97F0A9CA267122B96ABBCEA7E8FC8"}
+     "08E2A8A0E65147D4BD6316030E16D19C85C97F0A9CA267122B96ABBCEA7E8FC8",
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.35.1
@@ -30,7 +31,8 @@ R3410_2001_params R3410_2001_paramset[] = {
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97",
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C611070995AD10045841B09B761B893",
      "1",
-     "8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14"}
+     "8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14",
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.35.2
@@ -41,7 +43,8 @@ R3410_2001_params R3410_2001_paramset[] = {
      "8000000000000000000000000000000000000000000000000000000000000C99",
      "800000000000000000000000000000015F700CFFF1A624E5E497161BCC8A198F",
      "1",
-     "3FA8124359F96680B83D1C3EB2C070E5C545C9858D03ECFB744BF8D717717EFC"}
+     "3FA8124359F96680B83D1C3EB2C070E5C545C9858D03ECFB744BF8D717717EFC",
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.35.3
@@ -52,7 +55,8 @@ R3410_2001_params R3410_2001_paramset[] = {
      "9B9F605F5A858107AB1EC85E6B41C8AACF846E86789051D37998F7B9022D759B",
      "9B9F605F5A858107AB1EC85E6B41C8AA582CA3511EDDFB74F02F3A6598980BB9",
      "0",
-     "41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67"}
+     "41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67",
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.36.0
@@ -63,7 +67,8 @@ R3410_2001_params R3410_2001_paramset[] = {
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97",
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C611070995AD10045841B09B761B893",
      "1",
-     "8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14"}
+     "8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14",
+     "1", NULL}
     ,
     /*
      * 1.2.643.2.2.36.1
@@ -74,7 +79,116 @@ R3410_2001_params R3410_2001_paramset[] = {
      "9B9F605F5A858107AB1EC85E6B41C8AACF846E86789051D37998F7B9022D759B",
      "9B9F605F5A858107AB1EC85E6B41C8AA582CA3511EDDFB74F02F3A6598980BB9",
      "0",
-     "41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67"}
+     "41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67",
+     "1", NULL}
     ,
-    {0, 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 */
+
+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", NULL}
+    ,
+    {NID_id_tc26_gost_3410_2012_512_paramSetA,
+     /* a */
+     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC4",
+     /* b */
+     "E8C2505DEDFC86DDC1BD0B2B6667F1DA34B82574761CB0E879BD081CFD0B6265"
+     "EE3CB090F30D27614CB4574010DA90DD862EF9D4EBEE4761503190785A71C760",
+     /* p */
+     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7",
+     /* q */
+     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+     "27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275",
+     /* x */
+     "3",
+     /* y */
+     "7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF16"
+     "26BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4",
+     "1", NULL}
+    ,
+    {NID_id_tc26_gost_3410_2012_512_paramSetB,
+     /* a */
+     "8000000000000000000000000000000000000000000000000000000000000000"
+     "000000000000000000000000000000000000000000000000000000000000006C",
+     /* b */
+     "687D1B459DC841457E3E06CF6F5E2517B97C7D614AF138BCBF85DC806C4B289F"
+     "3E965D2DB1416D217F8B276FAD1AB69C50F78BEE1FA3106EFB8CCBC7C5140116",
+     /* p */
+     "8000000000000000000000000000000000000000000000000000000000000000"
+     "000000000000000000000000000000000000000000000000000000000000006F",
+     /* q */
+     "8000000000000000000000000000000000000000000000000000000000000001"
+     "49A1EC142565A545ACFDB77BD9D40CFA8B996712101BEA0EC6346C54374F25BD",
+     /* x */
+     "2",
+     /* y */
+     "1A8F7EDA389B094C2C071E3647A8940F3C123B697578C213BE6DD9E6C8EC7335"
+     "DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD",
+     "1", NULL}
+    ,
+    {NID_id_tc26_gost_3410_2012_512_paramSetC,
+     /* a */
+     "DC9203E514A721875485A529D2C722FB187BC8980EB866644DE41C68E1430645"
+     "46E861C0E2C9EDD92ADE71F46FCF50FF2AD97F951FDA9F2A2EB6546F39689BD3",
+     /* b */
+     "B4C4EE28CEBC6C2C8AC12952CF37F16AC7EFB6A9F69F4B57FFDA2E4F0DE5ADE0"
+     "38CBC2FFF719D2C18DE0284B8BFEF3B52B8CC7A5F5BF0A3C8D2319A5312557E1",
+     /* p */
+     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7",
+     /* q */
+     "3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+     "C98CDBA46506AB004C33A9FF5147502CC8EDA9E7A769A12694623CEF47F023ED",
+     /* x */
+     "E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043A"
+     "A27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148",
+     /* y */
+     "F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9B"
+     "E18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F",
+     "4", NULL}
+    ,
+    {NID_undef, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
 };