From: Richard Levitte <levitte@openssl.org>
Date: Wed, 14 Dec 2016 12:51:01 +0000 (+0100)
Subject: Make 'err' lable in ssl_cert_dup unconditional
X-Git-Tag: OpenSSL_1_0_2k~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3b584efe91ea55e7752819b4631448c4faab5988;p=oweals%2Fopenssl.git

Make 'err' lable in ssl_cert_dup unconditional

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2082)
---

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index f48ebaecc0..a3121db8d4 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -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);