[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  896dcb80651bd92546b73f4eac62bc211fca5a7d (commit)
      from  c8a56217f9e00430d4cf20b70246ee049f285da6 (commit)


- Log -----------------------------------------------------------------
commit 896dcb80651bd92546b73f4eac62bc211fca5a7d
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jun 8 11:20:34 2018 +0100

    Fix no-ec
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6437)

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

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

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index fd461c9..640da7c 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -488,7 +488,9 @@ static struct keys_st {
         EVP_PKEY_POLY1305, "01234567890123456789012345678901", NULL
     }, {
         EVP_PKEY_SIPHASH, "0123456789012345", NULL
-    }, {
+    },
+#ifndef OPENSSL_NO_EC
+    {
         EVP_PKEY_X25519, "01234567890123456789012345678901",
         "abcdefghijklmnopqrstuvwxyzabcdef"
     }, {
@@ -503,6 +505,7 @@ static struct keys_st {
         "012345678901234567890123456789012345678901234567890123456",
         "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcde"
     }
+#endif
 };
 
 static int test_set_get_raw_keys_int(int tst, int pub)