summaryrefslogtreecommitdiff
path: root/lib/pkix_asn1_tab.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2009-10-24 17:38:25 +0300
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2009-10-24 17:46:12 +0300
commit68996b00292596980d5ca440a434ebc32cf4c7c1 (patch)
treee54a55262bfee0c52fa62daa93757672c6c82463 /lib/pkix_asn1_tab.c
parent0cb109c4bf24899adc9103a832169f7881d59218 (diff)
downloadgnutls-68996b00292596980d5ca440a434ebc32cf4c7c1.tar.gz
Added support for the AES family of ciphers in the PKCS8 and 12 encryption options.
Diffstat (limited to 'lib/pkix_asn1_tab.c')
-rw-r--r--lib/pkix_asn1_tab.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c
index 1d8a37d1f9..1139a5f93f 100644
--- a/lib/pkix_asn1_tab.c
+++ b/lib/pkix_asn1_tab.c
@@ -424,6 +424,12 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
{ "pkcs-8-EncryptedData", 1073741831, NULL },
{ "pkcs-5-des-EDE3-CBC-params", 1612709895, NULL },
{ NULL, 1048586, "8"},
+ { "pkcs-5-aes128-CBC-params", 1612709895, NULL },
+ { NULL, 1048586, "16"},
+ { "pkcs-5-aes192-CBC-params", 1612709895, NULL },
+ { NULL, 1048586, "16"},
+ { "pkcs-5-aes256-CBC-params", 1612709895, NULL },
+ { NULL, 1048586, "16"},
{ "pkcs-5-PBES2-params", 1610612741, NULL },
{ "keyDerivationFunc", 1073741826, "AlgorithmIdentifier"},
{ "encryptionScheme", 2, "AlgorithmIdentifier"},