diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-10-09 16:04:17 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-10-09 16:04:17 +0000 |
| commit | 5473b6bc2fd4d3c09e5eaa29c1fb7745553069ef (patch) | |
| tree | a383426f14d91d09598f7959d76c3a2eedd5f9fe /crypto | |
| parent | 38e408076e2d32f6a9e9c78817af1a4492b72b01 (diff) | |
Fix memory leak. From HEAD.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/p5_pbev2.c | 2 |
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) |