summaryrefslogtreecommitdiffstats
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:52 +0100
commitbcd092d70606e750d69a04a731c98fe16bb7668d (patch)
tree5be29e6cfea5e0aa560b54a2e4ffc1b68be7538c
parent713f110f53e177061483954148b0802a52f38f99 (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)
-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;