[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  70705b291cbc496f1d70e4429cc54018e8113f08 (commit)
       via  3b584efe91ea55e7752819b4631448c4faab5988 (commit)
      from  292bb56846ad78ac7b68a00c92153c0c9471665b (commit)


- Log -----------------------------------------------------------------
commit 70705b291cbc496f1d70e4429cc54018e8113f08
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Dec 14 14:10:33 2016 +0100

    Fix ssl_cert_dup: change one 'return NULL' to 'goto err'
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2082)

commit 3b584efe91ea55e7752819b4631448c4faab5988
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Dec 14 13:51:01 2016 +0100

    Make 'err' lable in ssl_cert_dup unconditional
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2082)

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

Summary of changes:
 ssl/ssl_cert.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index f48ebae..1be6fb0 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -315,7 +315,7 @@ CERT *ssl_cert_dup(CERT *cert)
                 OPENSSL_malloc(cert->pkeys[i].serverinfo_length);
             if (ret->pkeys[i].serverinfo == NULL) {
                 SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE);
-                return NULL;
+                goto err;
             }
             ret->pkeys[i].serverinfo_length =
                 cert->pkeys[i].serverinfo_length;
@@ -392,9 +392,7 @@ CERT *ssl_cert_dup(CERT *cert)
 
     return (ret);
 
-#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_ECDH)
  err:
-#endif
 #ifndef OPENSSL_NO_RSA
     if (ret->rsa_tmp != NULL)
         RSA_free(ret->rsa_tmp);