projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Modify EVP cipher behaviour in a similar way
[openssl.git]
/
crypto
/
pkcs12
/
p12_crpt.c
diff --git
a/crypto/pkcs12/p12_crpt.c
b/crypto/pkcs12/p12_crpt.c
index 2a6de32d81d75afb55f39756af83b8fb8a9f5198..97be6a5fb538ad5b31bdff1759f8caac7ac54630 100644
(file)
--- a/
crypto/pkcs12/p12_crpt.c
+++ b/
crypto/pkcs12/p12_crpt.c
@@
-117,7
+117,7
@@
int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
return 0;
}
PBEPARAM_free(pbe);
- EVP_CipherInit
(ctx, cipher
, key, iv, en_de);
+ EVP_CipherInit
_ex(ctx, cipher, NULL
, key, iv, en_de);
memset(key, 0, EVP_MAX_KEY_LENGTH);
memset(iv, 0, EVP_MAX_IV_LENGTH);
return 1;