[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  51d9ac870acda2c818ce19c1174ed85f9a2f6eb7 (commit)
      from  71b35e1934087365610f9107aceac7d7a67cddcf (commit)


- Log -----------------------------------------------------------------
commit 51d9ac870acda2c818ce19c1174ed85f9a2f6eb7
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jul 24 12:24:45 2020 +0100

    Fix no-ec2m
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12526)

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

Summary of changes:
 providers/common/capabilities.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c
index 353da1ee32..44764fd70a 100644
--- a/providers/common/capabilities.c
+++ b/providers/common/capabilities.c
@@ -165,7 +165,10 @@ static int tls_group_capability(OSSL_CALLBACK *cb, void *arg)
 {
     size_t i;
 
-#if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_DH) && !defined(FIPS_MODULE)
+#if !defined(OPENSSL_NO_EC) \
+    && !defined(OPENSSL_NO_EC2M) \
+    && !defined(OPENSSL_NO_DH) \
+    && !defined(FIPS_MODULE)
     assert(OSSL_NELEM(param_group_list) == OSSL_NELEM(group_list));
 #endif
     for (i = 0; i < OSSL_NELEM(param_group_list); i++)