summaryrefslogtreecommitdiff
path: root/lib/gnutls_asn1_tab.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2018-06-23 16:54:03 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2018-06-23 16:54:03 +0000
commit6c4eac569e9b6b332e192e7f37a778e77494496b (patch)
treedb820eec9a645fccdcd2ddfbdecdb9e82a31edfc /lib/gnutls_asn1_tab.c
parent21df83a28d323768ddd9659a47509f04b64ce7fa (diff)
parentf75559023250c5beabaa49e51cd7b49cadfc5559 (diff)
downloadgnutls-6c4eac569e9b6b332e192e7f37a778e77494496b.tar.gz
Merge branch 'gost-no-tls' into 'master'
GOST certificates/PKCS#7/PKCS#12 support See merge request gnutls/gnutls!654
Diffstat (limited to 'lib/gnutls_asn1_tab.c')
-rw-r--r--lib/gnutls_asn1_tab.c8
1 files changed, 7 insertions, 1 deletions
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 }
};