diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-11-25 22:01:06 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-11-25 22:01:06 +0000 |
commit | 3d63b3966fc2d6913ba859e9a24c4d3a23387234 (patch) | |
tree | 43b83da206b9a4bcc057e5aa9349d00aa573792d /crypto/evp/evp_locl.h | |
parent | 451038b40c47d5ed76ac6622dd2bd7c3c7372a57 (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_locl.h')
-rw-r--r-- | crypto/evp/evp_locl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h index 34e4a65af6..4cb80fbde0 100644 --- a/crypto/evp/evp_locl.h +++ b/crypto/evp/evp_locl.h @@ -343,3 +343,7 @@ struct evp_pkey_method_st } /* EVP_PKEY_METHOD */; void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); + +int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, + ASN1_TYPE *param, + const EVP_CIPHER *c, const EVP_MD *md, int en_de); |