[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  14e06391a7805146ed6eb6415b6f58875b5c7686 (commit)
      from  67e247fad12308e34817e60c9242113c285fb00c (commit)


- Log -----------------------------------------------------------------
commit 14e06391a7805146ed6eb6415b6f58875b5c7686
Author: Pauli <paul.dale at oracle.com>
Date:   Mon Nov 6 11:30:00 2017 +1000

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4678)

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

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

diff --git a/apps/openssl.c b/apps/openssl.c
index 2edd700..fd89629 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