From: Kaspar Brand <ossl-rt@velox.ch>
Date: Tue, 6 Aug 2013 15:01:47 +0000 (+0100)
Subject: Fix for PEM_X509_INFO_read_bio.
X-Git-Tag: OpenSSL_1_0_1f~62
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6c03af135b285429a71ab3dac953ad9a70d8a1ac;p=oweals%2Fopenssl.git

Fix for PEM_X509_INFO_read_bio.

PR: 3028
Fix bug introduced in PEM_X509_INFO_bio which wouldn't process RSA keys
correctly if they appeared first.
(cherry picked from commit 5ae8d6bcbaff99423a2608559d738a3fcf7ed6dc)
---

diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index 1b2be527ed..cc7f24a9c1 100644
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -167,6 +167,7 @@ start:
 #ifndef OPENSSL_NO_RSA
 			if (strcmp(name,PEM_STRING_RSA) == 0)
 			{
+			d2i=(D2I_OF(void))d2i_RSAPrivateKey;
 			if (xi->x_pkey != NULL) 
 				{
 				if (!sk_X509_INFO_push(ret,xi)) goto err;