summaryrefslogtreecommitdiff
path: root/crypto/asn1/asn1.h
diff options
context:
space:
mode:
authorsteve <steve>2009-11-25 22:00:59 +0000
committersteve <steve>2009-11-25 22:00:59 +0000
commit1addc3964e263e51b2c9a19a94115688b1771153 (patch)
treebbc0920841fea3a481a09732741ca8b261fe3550 /crypto/asn1/asn1.h
parentba0f04bc8ef7c664640fd966e42b09d4d2f11883 (diff)
downloadopenssl-1addc3964e263e51b2c9a19a94115688b1771153.tar.gz
Split PBES2 into cipher and PBKDF2 versions. This tidies the code somewhat
and is a pre-requisite to adding password based CMS support.
Diffstat (limited to 'crypto/asn1/asn1.h')
-rw-r--r--crypto/asn1/asn1.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index f7718b5a9..4f9f7f605 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -1266,6 +1266,7 @@ void ERR_load_ASN1_strings(void);
#define ASN1_F_PKCS5_PBE2_SET_IV 167
#define ASN1_F_PKCS5_PBE_SET 202
#define ASN1_F_PKCS5_PBE_SET0_ALGOR 215
+#define ASN1_F_PKCS5_PBKDF2_SET 219
#define ASN1_F_SMIME_READ_ASN1 212
#define ASN1_F_SMIME_TEXT 213
#define ASN1_F_X509_CINF_NEW 168