[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c3d93da03b3588bbb7ed459a360fba37f7be1e0b (commit)
      from  d5e86796843ff0b1dab087ce2a6f867768436b63 (commit)


- Log -----------------------------------------------------------------
commit c3d93da03b3588bbb7ed459a360fba37f7be1e0b
Author: J Mohan Rao Arisankala <mohan at barracuda.com>
Date:   Fri Feb 26 11:37:08 2016 +0530

    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 at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/openssl.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index 7710c3a..df15574 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