projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Reject invalid constructed encodings.
[oweals/openssl.git]
/
crypto
/
asn1
/
p5_pbev2.c
diff --git
a/crypto/asn1/p5_pbev2.c
b/crypto/asn1/p5_pbev2.c
index b053a6efc0c15c2d8d7f9c90e290c5d680d52055..4ea683036b17f6d264a7e8f84afe743b02a23e34 100644
(file)
--- a/
crypto/asn1/p5_pbev2.c
+++ b/
crypto/asn1/p5_pbev2.c
@@
-153,6
+153,8
@@
X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
/* Setup keyfunc */
+ X509_ALGOR_free(pbe2->keyfunc);
+
pbe2->keyfunc = PKCS5_pbkdf2_set(iter, salt, saltlen, prf_nid, keylen);
if (!pbe2->keyfunc)