[openssl-commits] [openssl] master update

Richard Levitte levitte at openssl.org
Sat Sep 19 23:58:00 UTC 2015


The branch master has been updated
       via  da9a22bb579821d0ababac7319c2f2995e66e4d3 (commit)
       via  56c1ef05014239f4bfa377946a30fe38c95d25fd (commit)
       via  2df84dd3299ff25fa078ca7ffbdeaac65b361feb (commit)
       via  66b14bab0a7cfbf58d5df342e26e57f474592a8e (commit)
       via  27dae1b04fb5d5af32b87c5e52091fe74632efa3 (commit)
       via  d230bd1ddd71d7557275a72899bcc11c5503dd4f (commit)
      from  54180592d7259382bd6ed1198cdbcb0b3be50749 (commit)


- Log -----------------------------------------------------------------
commit da9a22bb579821d0ababac7319c2f2995e66e4d3
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 20 01:50:11 2015 +0200

    Finally, remove a possibly disabled feature
    
    I have no clue why MD_GHOST94 was checked on, there is no
    OPENSSL_NO_MD_GHOST94 in sight anywhere
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 56c1ef05014239f4bfa377946a30fe38c95d25fd
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 20 01:42:14 2015 +0200

    Add more features that may be disabled
    
    Have a look at the directories in crypto/, I found reason to add
    checks on CMAC and HMAC.  This might be completely irrelevant, but I
    prefered covering too much than not enough.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 2df84dd3299ff25fa078ca7ffbdeaac65b361feb
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 20 01:31:47 2015 +0200

    Add more features that may be disabled
    
    A grep of OPENSSL_NO_ in the rest of the source tree revealed a few
    more features to check.
    
    NOTE: there are some of those macros that I ignore because a check of
    them doesn't seem useful to external apps.  This might change later on.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 66b14bab0a7cfbf58d5df342e26e57f474592a8e
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 20 00:54:03 2015 +0200

    Add more features that may be disabled
    
    After a grep of OPENSSL_NO_ in apps/*.c, a few more features that may
    be interesting to check the availability of came up.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 27dae1b04fb5d5af32b87c5e52091fe74632efa3
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 20 00:26:14 2015 +0200

    Add more features that may be disabled
    
    I've tried to make this list as complete as possible, based on
    information found in apps/progs.pl.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit d230bd1ddd71d7557275a72899bcc11c5503dd4f
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Sep 20 00:25:14 2015 +0200

    Sort the disabled features alphabetically
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 apps/openssl.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 107 insertions(+), 5 deletions(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index e96c211..d01731f 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -722,15 +722,42 @@ static int SortFnByName(const void *_f1, const void *_f2)
 
 static void list_disabled(void)
 {
-BIO_puts(bio_out, "Disabled algorithms:\n");
+    BIO_puts(bio_out, "Disabled algorithms:\n");
+#ifdef OPENSSL_NO_AES
+    BIO_puts(bio_out, "AES\n");
+#endif
+#ifdef OPENSSL_NO_BF
+    BIO_puts(bio_out, "BF\n");
+#endif
+#ifdef OPENSSL_NO_CAMELLIA
+    BIO_puts(bio_out, "CAMELLIA\n");
+#endif
+#ifdef OPENSSL_NO_CAST
+    BIO_puts(bio_out, "CAST\n");
+#endif
+#ifdef OPENSSL_NO_CMAC
+    BIO_puts(bio_out, "CMAC\n");
+#endif
+#ifdef OPENSSL_NO_CMS
+    BIO_puts(bio_out, "CMS\n");
+#endif
+#ifdef OPENSSL_NO_COMP
+    BIO_puts(bio_out, "COMP\n");
+#endif
+#ifdef OPENSSL_NO_DES
+    BIO_puts(bio_out, "DES\n");
+#endif
+#ifdef OPENSSL_NO_DGRAM
+    BIO_puts(bio_out, "DGRAM\n");
+#endif
 #ifdef OPENSSL_NO_DH
     BIO_puts(bio_out, "DH\n");
 #endif
 #ifdef OPENSSL_NO_DSA
     BIO_puts(bio_out, "DSA\n");
 #endif
-#ifdef OPENSSL_NO_RSA
-    BIO_puts(bio_out, "RSA\n");
+#if defined(OPENSSL_NO_DTLS1) || defined(OPENSSL_NO_DTLS)
+    BIO_puts(bio_out, "DTLS1\n");
 #endif
 #ifdef OPENSSL_NO_EC
     BIO_puts(bio_out, "EC\n");
@@ -738,15 +765,90 @@ BIO_puts(bio_out, "Disabled algorithms:\n");
 #ifdef OPENSSL_NO_EC2M
     BIO_puts(bio_out, "EC2M\n");
 #endif
-#ifndef ZLIB
-    BIO_puts(bio_out, "ZLIB\n");
+#ifdef OPENSSL_NO_ENGINE
+    BIO_puts(bio_out, "ENGINE\n");
+#endif
+#ifdef OPENSSL_NO_GOST
+    BIO_puts(bio_out, "GOST\n");
+#endif
+#ifdef OPENSSL_NO_HMAC
+    BIO_puts(bio_out, "HMAC\n");
+#endif
+#ifdef OPENSSL_NO_IDEA
+    BIO_puts(bio_out, "IDEA\n");
+#endif
+#ifdef OPENSSL_NO_JPAKE
+    BIO_puts(bio_out, "JPAKE\n");
+#endif
+#ifdef OPENSSL_NO_MD2
+    BIO_puts(bio_out, "MD2\n");
+#endif
+#ifdef OPENSSL_NO_MD4
+    BIO_puts(bio_out, "MD4\n");
+#endif
+#ifdef OPENSSL_NO_MD5
+    BIO_puts(bio_out, "MD5\n");
+#endif
+#ifdef OPENSSL_NO_MDC2
+    BIO_puts(bio_out, "MDC2\n");
+#endif
+#ifdef OPENSSL_NO_OCB
+    BIO_puts(bio_out, "OCB\n");
+#endif
+#ifdef OPENSSL_NO_OCSP
+    BIO_puts(bio_out, "OCSP\n");
 #endif
 #ifdef OPENSSL_NO_PSK
     BIO_puts(bio_out, "PSK\n");
 #endif
+#ifdef OPENSSL_NO_RC2
+    BIO_puts(bio_out, "RC2\n");
+#endif
+#ifdef OPENSSL_NO_RC4
+    BIO_puts(bio_out, "RC4\n");
+#endif
+#ifdef OPENSSL_NO_RC5
+    BIO_puts(bio_out, "RC5\n");
+#endif
+#ifdef OPENSSL_NO_RMD160
+    BIO_puts(bio_out, "RMD160\n");
+#endif
+#ifdef OPENSSL_NO_RSA
+    BIO_puts(bio_out, "RSA\n");
+#endif
+#ifdef OPENSSL_NO_SCRYPT
+    BIO_puts(bio_out, "SCRYPT\n");
+#endif
+#ifdef OPENSSL_NO_SCT
+    BIO_puts(bio_out, "SCT\n");
+#endif
+#ifdef OPENSSL_NO_SCTP
+    BIO_puts(bio_out, "SCTP\n");
+#endif
+#ifdef OPENSSL_NO_SEED
+    BIO_puts(bio_out, "SEED\n");
+#endif
+#ifdef OPENSSL_NO_SHA
+    BIO_puts(bio_out, "SHA\n");
+#endif
+#ifdef OPENSSL_NO_SOCK
+    BIO_puts(bio_out, "SOCK\n");
+#endif
 #ifdef OPENSSL_NO_SRP
     BIO_puts(bio_out, "SRP\n");
 #endif
+#ifdef OPENSSL_NO_SRTP
+    BIO_puts(bio_out, "SRTP\n");
+#endif
+#ifdef OPENSSL_NO_SSL3
+    BIO_puts(bio_out, "SSL3\n");
+#endif
+#ifdef OPENSSL_NO_WHIRLPOOL
+    BIO_puts(bio_out, "WHIRLPOOL\n");
+#endif
+#ifndef ZLIB
+    BIO_puts(bio_out, "ZLIB\n");
+#endif
 }
 
 static LHASH_OF(FUNCTION) *prog_init(void)


More information about the openssl-commits mailing list