diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-02-18 00:34:59 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-03-02 15:26:57 +0000 |
| commit | 241cff623e2b0f7c435a3a80ae783c29d994f061 (patch) | |
| tree | d53e0b027d903b1751358f3fd957f029b050f21c | |
| parent | 8a8ba0716796af963947586dca063ca95460010e (diff) | |
Check public key is not NULL.
CVE-2015-0288
PR#3708
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 28a00bcd8e318da18031b2ac8778c64147cd54f9)
| -rw-r--r-- | crypto/x509/x509_req.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c index c1a2608819..31e59c49db 100644 --- a/crypto/x509/x509_req.c +++ b/crypto/x509/x509_req.c @@ -91,6 +91,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) |