From c5137473bdc7bcf7c43b4bd5d28827f8ddd70490 Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Sun, 3 Apr 2016 23:37:32 +0200 Subject: Use X509_REQ_get0_pubkey Reviewed-by: Stephen Henson Reviewed-by: Rich Salz --- crypto/x509/x509_r2x.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'crypto') diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c index dc7e41265c..d082636de4 100644 --- a/crypto/x509/x509_r2x.c +++ b/crypto/x509/x509_r2x.c @@ -101,21 +101,14 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) NULL) goto err; - pubkey = X509_REQ_get_pubkey(r); - if (pubkey == NULL) + pubkey = X509_REQ_get0_pubkey(r); + if (pubkey == NULL || !X509_set_pubkey(ret, pubkey)) goto err; - if (!X509_set_pubkey(ret, pubkey)) - goto err_pkey; - - EVP_PKEY_free(pubkey); - if (!X509_sign(ret, pkey, EVP_md5())) goto err; return ret; - err_pkey: - EVP_PKEY_free(pubkey); err: X509_free(ret); return NULL; -- cgit v1.2.3