summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2015-09-20 01:31:47 +0200
committerRichard Levitte <levitte@openssl.org>2015-09-20 01:57:57 +0200
commit2df84dd3299ff25fa078ca7ffbdeaac65b361feb (patch)
tree169f4788ab756f1844abbf58382dfd9bef98ddf3
parent66b14bab0a7cfbf58d5df342e26e57f474592a8e (diff)
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@openssl.org>
-rw-r--r--apps/openssl.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/apps/openssl.c b/apps/openssl.c
index 21ddeb3c54..90f2223c70 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -744,13 +744,16 @@ static void list_disabled(void)
#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_DTLS1
+#if defined(OPENSSL_NO_DTLS1) || defined(OPENSSL_NO_DTLS)
BIO_puts(bio_out, "DTLS1\n");
#endif
#ifdef OPENSSL_NO_EC
@@ -762,6 +765,9 @@ static void list_disabled(void)
#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_IDEA
BIO_puts(bio_out, "IDEA\n");
#endif
@@ -783,6 +789,9 @@ static void list_disabled(void)
#ifdef OPENSSL_NO_MD_GHOST94
BIO_puts(bio_out, "MD_GHOST94\n");
#endif
+#ifdef OPENSSL_NO_OCB
+ BIO_puts(bio_out, "OCB\n");
+#endif
#ifdef OPENSSL_NO_OCSP
BIO_puts(bio_out, "OCSP\n");
#endif
@@ -807,9 +816,18 @@ static void list_disabled(void)
#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