[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  aa24cd1bfbf4fb51bc51d8b3b5c68563616a28ab (commit)
      from  8e1634ec36c9a125f3aa1c48b743ff864c6fcbd3 (commit)


- Log -----------------------------------------------------------------
commit aa24cd1bfbf4fb51bc51d8b3b5c68563616a28ab
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Apr 26 17:08:22 2017 +0100

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

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

Summary of changes:
 test/evp_extra_test.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 80737f9..d780161 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -196,7 +196,9 @@ typedef struct APK_DATA_st {
 static APK_DATA keydata[] = {
     {kExampleRSAKeyDER, sizeof(kExampleRSAKeyDER), EVP_PKEY_RSA},
     {kExampleRSAKeyPKCS8, sizeof(kExampleRSAKeyPKCS8), EVP_PKEY_RSA},
+#ifndef OPENSSL_NO_EC
     {kExampleECKeyDER, sizeof(kExampleECKeyDER), EVP_PKEY_EC}
+#endif
 };
 
 static EVP_PKEY *load_example_rsa_key(void)