[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  28a00bcd8e318da18031b2ac8778c64147cd54f9 (commit)
      from  437b14b533fe7f7408e3ebca6d5569f1d3347b1a (commit)


- Log -----------------------------------------------------------------
commit 28a00bcd8e318da18031b2ac8778c64147cd54f9
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Feb 18 00:34:59 2015 +0000

    Check public key is not NULL.
    
    CVE-2015-0288
    PR#3708
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509_req.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index bc6e566..01795f4 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -92,6 +92,8 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         goto err;
 
     pktmp = X509_get_pubkey(x);
+    if (pktmp == NULL)
+        goto err;
     i = X509_REQ_set_pubkey(ret, pktmp);
     EVP_PKEY_free(pktmp);
     if (!i)