summaryrefslogtreecommitdiffstats
path: root/test/evp_test.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-03-19 10:22:46 +0000
committerMatt Caswell <matt@openssl.org>2018-03-19 12:34:29 +0000
commit66a925ea8c91d883bd0603bcee5705025b564bd6 (patch)
tree0341d0b0a214d0e5adf788bcf7cde76074cce435 /test/evp_test.c
parent3ec9e4ec46eb4356bc106db5e0e33148c693c8f0 (diff)
Fix no-ec
Raw private/public key loading may fail for X25519/X448 if ec has been disabled. Also fixed a missing blank line in evppkey.txt resulting in a warning in the test output. Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5664)
Diffstat (limited to 'test/evp_test.c')
-rw-r--r--test/evp_test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/evp_test.c b/test/evp_test.c
index 3e237b014b..3244da6549 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -2489,7 +2489,7 @@ top:
pkey = EVP_PKEY_new_raw_private_key(nid, NULL, keybin, keylen);
else
pkey = EVP_PKEY_new_raw_public_key(nid, NULL, keybin, keylen);
- if (pkey == NULL) {
+ if (pkey == NULL && !key_unsupported()) {
TEST_info("Can't read %s data", pp->key);
OPENSSL_free(keybin);
TEST_openssl_errors();