From: Pauli <paul.dale@oracle.com>
Date: Mon, 6 Nov 2017 01:30:00 +0000 (+1000)
Subject: Disabled list doesn't contain SM3 and SM4.
X-Git-Tag: OpenSSL_1_1_1-pre1~467
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=14e06391a7805146ed6eb6415b6f58875b5c7686

Disabled list doesn't contain SM3 and SM4.

The Chinese cryptographic operations should appear in the disabled list if they
are disabled.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4678)
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 2edd70086f..fd89629bbe 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -750,6 +750,12 @@ static void list_disabled(void)
 #ifdef OPENSSL_NO_SEED
     BIO_puts(bio_out, "SEED\n");
 #endif
+#ifdef OPENSSL_NO_SM3
+    BIO_puts(bio_out, "SM3\n");
+#endif
+#ifdef OPENSSL_NO_SM4
+    BIO_puts(bio_out, "SM4\n");
+#endif
 #ifdef OPENSSL_NO_SOCK
     BIO_puts(bio_out, "SOCK\n");
 #endif