From: J Mohan Rao Arisankala <mohan@barracuda.com>
Date: Fri, 26 Feb 2016 06:07:08 +0000 (+0530)
Subject: remove unused macros in list -disabled
X-Git-Tag: OpenSSL_1_1_0-pre6~925
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c3d93da03b3588bbb7ed459a360fba37f7be1e0b;p=oweals%2Fopenssl.git

remove unused macros in list -disabled

list -disabled was checking OPENSSL_NO_SSL/OPENSSL_NO_TLS, which are
not used to disable SSL/TLS respectively.
Building with these macros wrongly show as SSL/TLS disabled, hence
removing this code.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 7710c3a54c..df15574205 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -756,15 +756,9 @@ static void list_disabled(void)
 #ifdef OPENSSL_NO_SRTP
     BIO_puts(bio_out, "SRTP\n");
 #endif
-#ifdef OPENSSL_NO_SSL
-    BIO_puts(bio_out, "SSL\n");
-#endif
 #ifdef OPENSSL_NO_SSL3
     BIO_puts(bio_out, "SSL3\n");
 #endif
-#if defined(OPENSSL_NO_TLS)
-    BIO_puts(bio_out, "TLS\n");
-#endif
 #ifdef OPENSSL_NO_TLS1
     BIO_puts(bio_out, "TLS1\n");
 #endif