summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2016-10-21 04:43:35 +0300
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2018-06-23 12:20:15 +0300
commit9083bcd3babe035f04d7114f3f520e50aa6e9f79 (patch)
tree23e25b35a586b6ef3eab36327d7c8408b1ade8ac
parent5b6c4b0a3d7d96638b8498e40a40b463483e2c57 (diff)
downloadgnutls-9083bcd3babe035f04d7114f3f520e50aa6e9f79.tar.gz
Add ASN.1 definitions for GOST keys
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-rw-r--r--lib/gnutls.asn10
-rw-r--r--lib/gnutls_asn1_tab.c8
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/gnutls.asn b/lib/gnutls.asn
index 570d8263fd..f4dacdefe7 100644
--- 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 d58f864c0b..06a6ecefa4 100644
--- 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 }
};