Split PBES2 into cipher and PBKDF2 versions. This tidies the code somewhat

and is a pre-requisite to adding password based CMS support.

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);