[openssl] master update

[kaishen . yy]

The branch master has been updated
       via  dcea51afe9e3aec83a0c53f435beec9bc0faa07b (commit)
      from  bdb0e04fd0d8a797ecc367a522857dc8beec424d (commit)


- Log -----------------------------------------------------------------
commit dcea51afe9e3aec83a0c53f435beec9bc0faa07b
Author: Paul Yang <kaishen...@antfin.com>
Date:   Mon Nov 4 11:49:35 2019 +0800

    Fix no-sm2 issue
    
    Some code is not covered by the macros.
    
    Reviewed-by: Richard Levitte <levi...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10319)

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

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

diff --git a/apps/speed.c b/apps/speed.c
index 9d7bff0c31..7117c6f068 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1713,10 +1713,14 @@ int speed_main(int argc, char **argv)
     int ecdsa_doit[ECDSA_NUM] = { 0 };
     int ecdh_doit[EC_NUM] = { 0 };
     int eddsa_doit[EdDSA_NUM] = { 0 };
+# ifndef OPENSSL_NO_SM2
     int sm2_doit[SM2_NUM] = { 0 };
+# endif
     OPENSSL_assert(OSSL_NELEM(test_curves) >= EC_NUM);
     OPENSSL_assert(OSSL_NELEM(test_ed_curves) >= EdDSA_NUM);
+# ifndef OPENSSL_NO_SM2
     OPENSSL_assert(OSSL_NELEM(test_sm2_curves) >= SM2_NUM);
+# endif
 #endif                          /* ndef OPENSSL_NO_EC */
 
     prog = opt_init(argc, argv, speed_options);