The branch master has been updated via 8a8bc665626113005f39121d582fd96104fb84cf (commit) from cded951378069a478391843f5f8653c1eb5128da (commit)
- Log ----------------------------------------------------------------- commit 8a8bc665626113005f39121d582fd96104fb84cf Author: Benjamin Kaduk <bka...@akamai.com> Date: Thu Dec 7 17:57:21 2017 -0600 Fix no-ec Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4874) ----------------------------------------------------------------------- Summary of changes: test/evp_extra_test.c | 4 ++++ test/recipes/80-test_ssl_new.t | 1 + 2 files changed, 5 insertions(+) diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index 1e1fa17..e63d683 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -498,7 +498,9 @@ static int test_EVP_PKEY_check(int i) int ret = 0; const unsigned char *p; EVP_PKEY *pkey = NULL; +#ifndef OPENSSL_NO_EC EC_KEY *eckey = NULL; +#endif EVP_PKEY_CTX *ctx = NULL; EVP_PKEY_CTX *ctx2 = NULL; const APK_DATA *ak = &keycheckdata[i]; @@ -519,6 +521,7 @@ static int test_EVP_PKEY_check(int i) || !TEST_int_eq(EVP_PKEY_id(pkey), expected_id))) goto done; +#ifndef OPENSSL_NO_EC if (type == 1 && (!TEST_ptr(pubkey = BIO_new_mem_buf(input, input_len)) || !TEST_ptr(eckey = d2i_EC_PUBKEY_bio(pubkey, NULL)) @@ -532,6 +535,7 @@ static int test_EVP_PKEY_check(int i) || !TEST_ptr(pkey = EVP_PKEY_new()) || !TEST_true(EVP_PKEY_assign_EC_KEY(pkey, eckey)))) goto done; +#endif if (!TEST_ptr(ctx = EVP_PKEY_CTX_new(pkey, NULL))) goto done; diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 3b1447b..caf3536 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -94,6 +94,7 @@ my %skip = ( "23-srp.conf" => (disabled("tls1") && disabled ("tls1_1") && disabled("tls1_2")) || disabled("srp"), "24-padding.conf" => disabled("tls1_3"), + "25-cipher.conf" => disabled("ec"), ); foreach my $conf (@conf_files) { _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits