[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a5cf198bad4c49c2850e16c34d929c28a37afcc3 (commit)
      from  b8621bdde70690361a36dca52688a3d946c3fe0f (commit)


- Log -----------------------------------------------------------------
commit a5cf198bad4c49c2850e16c34d929c28a37afcc3
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Apr 19 11:17:44 2019 +0100

    Fix no-ec2m
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    (Merged from https://github.com/openssl/openssl/pull/8792)

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

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

diff --git a/test/ectest.c b/test/ectest.c
index ab75ace..3f7747e 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -1884,11 +1884,14 @@ static int check_ec_key_field_public_range_test(int id)
      * be the same point on the curve). The add is different for char2 fields.
      */
     type = EC_METHOD_get_field_type(meth);
+#ifndef OPENSSL_NO_EC2M
     if (type == NID_X9_62_characteristic_two_field) {
         /* test for binary curves */
         if (!TEST_true(BN_GF2m_add(x, x, field)))
             goto err;
-    } else if (type == NID_X9_62_prime_field) {
+    } else
+#endif
+    if (type == NID_X9_62_prime_field) {
         /* test for prime curves */
         if (!TEST_true(BN_add(x, x, field)))
             goto err;