From 89b77050fdffde3f7b75d4106f130614fb8961a6 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 18 Feb 2015 00:34:59 +0000 Subject: Check public key is not NULL. CVE-2015-0288 PR#3708 Reviewed-by: Matt Caswell (cherry picked from commit 28a00bcd8e318da18031b2ac8778c64147cd54f9) --- 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 48183dc..6876d6c 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) goto err; -- cgit v1.1