From 5473b6bc2fd4d3c09e5eaa29c1fb7745553069ef Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 9 Oct 2011 16:04:17 +0000
Subject: [PATCH] Fix memory leak. From HEAD.

---
 crypto/asn1/p5_pbev2.c | 2 ++
 1 file changed, 2 insertions(+)

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)
-- 
2.25.1