Add ASN.1 definitions for GOST keys

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

diff --git a/lib/gnutls.asn b/lib/gnutls.asn
index 570d8263fd578e7c563bf6c0d535b50282281d94..f4dacdefe7240c7960ce718f21e8cdd7bd621a85 100644 (file)
--- a/lib/gnutls.asn
+++ b/lib/gnutls.asn
@@ -121,4 +121,14 @@ RSAPSSParameters ::= SEQUENCE {
        trailerField            [3] INTEGER DEFAULT 1
 }
 
+-- GOST R 34.10
+GOSTParameters ::= SEQUENCE {
+   publicKeyParamSet  OBJECT IDENTIFIER,
+   digestParamSet     OBJECT IDENTIFIER,
+   encryptionParamSet OBJECT IDENTIFIER OPTIONAL
+}
+
+GOSTPrivateKey ::= OCTET STRING
+GOSTPrivateKeyOld ::= INTEGER
+
 END

diff --git a/lib/gnutls_asn1_tab.c b/lib/gnutls_asn1_tab.c
index d58f864c0b2f3bb1b659ce9d6d1c9756b87a4727..06a6ecefa43346099ba2bbfea29ecdb7063abf45 100644 (file)
--- a/lib/gnutls_asn1_tab.c
+++ b/lib/gnutls_asn1_tab.c
@@ -78,7 +78,7 @@ const asn1_static_node gnutls_asn1_tab[] = {
   { NULL, 2056, "0"},
   { "principalName", 536879106, "PrincipalName"},
   { NULL, 2056, "1"},
-  { "RSAPSSParameters", 536870917, NULL },
+  { "RSAPSSParameters", 1610612741, NULL },
   { "hashAlgorithm", 1610637314, "AlgorithmIdentifier"},
   { NULL, 2056, "0"},
   { "maskGenAlgorithm", 1610637314, "AlgorithmIdentifier"},
@@ -89,5 +89,11 @@ const asn1_static_node gnutls_asn1_tab[] = {
   { "trailerField", 536911875, NULL },
   { NULL, 1073741833, "1"},
   { NULL, 2056, "3"},
+  { "GOSTParameters", 1610612741, NULL },
+  { "publicKeyParamSet", 1073741836, NULL },
+  { "digestParamSet", 1073741836, NULL },
+  { "encryptionParamSet", 16396, NULL },
+  { "GOSTPrivateKey", 1073741831, NULL },
+  { "GOSTPrivateKeyOld", 3, NULL },
   { NULL, 0, NULL }
 };