From 68edd00d9258df93b1366c71ac124e0cadf7bc08 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 29 Apr 2005 05:39:33 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/pem/pem_pkey.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/lib/libcrypto/pem/pem_pkey.c')

diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c
index f77c949e87..9ecdbd5419 100644
--- a/src/lib/libcrypto/pem/pem_pkey.c
+++ b/src/lib/libcrypto/pem/pem_pkey.c
@@ -104,6 +104,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo
 		if (klen <= 0) {
 			PEMerr(PEM_F_PEM_ASN1_READ_BIO,
 					PEM_R_BAD_PASSWORD_READ);
+			X509_SIG_free(p8);
 			goto err;
 		}
 		p8inf = PKCS8_decrypt(p8, psbuf, klen);
-- 
cgit v1.2.3-55-g6feb