Don't switch password formats using global state.

[openssl.git] / crypto / pkcs12 / p12_crpt.c

diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index d30aab379adb991750bde32ba3e094b9d3279c94..feef9d1fc4cbcce68cc194c4e529b8ebecbe6b86 100644 (file)
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -17,16 +17,6 @@ void PKCS12_PBE_add(void)
 {
 }
 
-#undef PKCS12_key_gen
-/*
- * See p12_multi.c:PKCS12_verify_mac() for details...
- */
-extern int (*PKCS12_key_gen)(const char *pass, int passlen,
-                             unsigned char *salt, int slen,
-                             int id, int iter, int n,
-                             unsigned char *out,
-                             const EVP_MD *md_type);
-
 int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                         ASN1_TYPE *param, const EVP_CIPHER *cipher,
                         const EVP_MD *md, int en_de)
@@ -41,13 +31,7 @@ int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                           unsigned char *out,
                           const EVP_MD *md_type);
 
-    if (PKCS12_key_gen == NULL || en_de)
-        /*
-         * Default to UTF-8, but force it in encrypt case.
-         */
-        pkcs12_key_gen = PKCS12_key_gen_utf8;
-    else
-        pkcs12_key_gen = PKCS12_key_gen;
+    pkcs12_key_gen = PKCS12_key_gen_utf8;
 
     if (cipher == NULL)
         return 0;