summaryrefslogtreecommitdiffstats
path: root/crypto/asn1
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-02-07 13:34:00 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-02-07 13:34:00 +0000
commitf9678b8b578cf62305b2fb6275216ec4d11f4e39 (patch)
tree92d07711581602e0f05e162ee68877e12cc569fd /crypto/asn1
parent83e9c36261dc8546276845f48d1ad65967acd598 (diff)
Fix memory leak.
Diffstat (limited to 'crypto/asn1')
-rw-r--r--crypto/asn1/p5_pbev2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index b053a6efc0..4ea683036b 100644
--- 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)