remove unused macros in list -disabled
authorJ Mohan Rao Arisankala <mohan@barracuda.com>
Fri, 26 Feb 2016 06:07:08 +0000 (11:37 +0530)
committerMatt Caswell <matt@openssl.org>
Thu, 5 May 2016 13:25:41 +0000 (14:25 +0100)
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>
apps/openssl.c

index 7710c3a54c18a990042e621c078586696b45c547..df1557420587102202be490016104d0c49df9f0f 100644 (file)
@@ -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