summaryrefslogtreecommitdiff
path: root/lib/includes/gnutls/x509.h
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/includes/gnutls/x509.h
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/includes/gnutls/x509.h')
-rw-r--r--lib/includes/gnutls/x509.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index e61ef25684..81ae14ddb9 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -578,7 +578,10 @@ extern "C"
GNUTLS_PKCS_USE_PKCS12_3DES = 2,
GNUTLS_PKCS_USE_PKCS12_ARCFOUR = 4,
GNUTLS_PKCS_USE_PKCS12_RC2_40 = 8,
- GNUTLS_PKCS_USE_PBES2_3DES = 16
+ GNUTLS_PKCS_USE_PBES2_3DES = 16,
+ GNUTLS_PKCS_USE_PBES2_AES_128 = 32,
+ GNUTLS_PKCS_USE_PBES2_AES_192 = 64,
+ GNUTLS_PKCS_USE_PBES2_AES_256 = 128,
} gnutls_pkcs_encrypt_flags_t;
#define GNUTLS_PKCS8_PLAIN GNUTLS_PKCS_PLAIN