summaryrefslogtreecommitdiffstats
path: root/crypto/evp/evp.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-11-25 22:01:06 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-11-25 22:01:06 +0000
commit3d63b3966fc2d6913ba859e9a24c4d3a23387234 (patch)
tree43b83da206b9a4bcc057e5aa9349d00aa573792d /crypto/evp/evp.h
parent451038b40c47d5ed76ac6622dd2bd7c3c7372a57 (diff)
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/evp/evp.h')
-rw-r--r--crypto/evp/evp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index cac090ebe4..b8aa8b3ce2 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -1236,6 +1236,7 @@ void ERR_load_EVP_strings(void);
#define EVP_F_INT_CTX_NEW 157
#define EVP_F_PKCS5_PBE_KEYIVGEN 117
#define EVP_F_PKCS5_V2_PBE_KEYIVGEN 118
+#define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN 164
#define EVP_F_PKCS8_SET_BROKEN 112
#define EVP_F_PKEY_SET_TYPE 158
#define EVP_F_RC2_MAGIC_TO_METH 109