Because Rijndael is more known as AES, use crypto/aes instead of

[openssl.git] / crypto / evp / p5_crpt.c

diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c
index f05273f257b411bd12a7c3b3c118b2726216d10d..113c60fedb860d046cb8a8400feced9f9f28a69e 100644 (file)
--- a/crypto/evp/p5_crpt.c
+++ b/crypto/evp/p5_crpt.c
@@ -129,21 +129,21 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
        else if(passlen == -1) passlen = strlen(pass);
 
        EVP_MD_CTX_init(&ctx);
-       EVP_DigestInit (&ctx, md);
-       EVP_DigestUpdate (&ctx, pass, passlen);
-       EVP_DigestUpdate (&ctx, salt, saltlen);
+       EVP_DigestInit_ex(&ctx, md, NULL);
+       EVP_DigestUpdate(&ctx, pass, passlen);
+       EVP_DigestUpdate(&ctx, salt, saltlen);
        PBEPARAM_free(pbe);
-       EVP_DigestFinal (&ctx, md_tmp, NULL);
+       EVP_DigestFinal_ex(&ctx, md_tmp, NULL);
        for (i = 1; i < iter; i++) {
-               EVP_DigestInit(&ctx, md);
+               EVP_DigestInit_ex(&ctx, md, NULL);
                EVP_DigestUpdate(&ctx, md_tmp, EVP_MD_size(md));
-               EVP_DigestFinal (&ctx, md_tmp, NULL);
+               EVP_DigestFinal_ex (&ctx, md_tmp, NULL);
        }
        EVP_MD_CTX_cleanup(&ctx);
-       memcpy (key, md_tmp, EVP_CIPHER_key_length(cipher));
-       memcpy (iv, md_tmp + (16 - EVP_CIPHER_iv_length(cipher)),
+       memcpy(key, md_tmp, EVP_CIPHER_key_length(cipher));
+       memcpy(iv, md_tmp + (16 - EVP_CIPHER_iv_length(cipher)),
                                                 EVP_CIPHER_iv_length(cipher));
-       EVP_CipherInit(cctx, cipher, key, iv, en_de);
+       EVP_CipherInit_ex(cctx, cipher, NULL, key, iv, en_de);
        memset(md_tmp, 0, EVP_MAX_MD_SIZE);
        memset(key, 0, EVP_MAX_KEY_LENGTH);
        memset(iv, 0, EVP_MAX_IV_LENGTH);