projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Split PBES2 into cipher and PBKDF2 versions. This tidies the code somewhat
[openssl.git]
/
crypto
/
asn1
/
asn1.h
diff --git
a/crypto/asn1/asn1.h
b/crypto/asn1/asn1.h
index f7718b5a94be016fad6433188e08f8aa9787cdd3..4f9f7f605fda301b4832421642489bc605c406b0 100644
(file)
--- 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