summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorKaspar Brand <ossl-rt@velox.ch>2013-08-06 16:01:47 +0100
committerDr. Stephen Henson <steve@openssl.org>2013-08-06 16:05:19 +0100
commit6c03af135b285429a71ab3dac953ad9a70d8a1ac (patch)
treec6786d7bfb4550655a900019e196c348cef7b8f4 /crypto
parent5cd1aa4f1533c84fb78f04f827496fb339e34fc5 (diff)
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)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/pem/pem_info.c1
1 files changed, 1 insertions, 0 deletions
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;