no-ec fix
authorDr. Stephen Henson <steve@openssl.org>
Wed, 26 Apr 2017 17:46:31 +0000 (18:46 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 30 May 2017 19:38:20 +0000 (20:38 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3503)

test/recipes/25-test_verify.t

index 643b02e83494d2040ea9eb12b3cb559d377c29b0..001d37a51bc9cafeeef4fe462358d81a911a0a02 100644 (file)
@@ -12,6 +12,7 @@ use warnings;
 
 use File::Spec::Functions qw/canonpath/;
 use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_verify");
 
@@ -341,6 +342,12 @@ ok(!verify("ee-pss-sha1-cert", "sslserver", ["root-cert"], ["ca-cert"], "-auth_l
 ok(verify("ee-pss-sha256-cert", "sslserver", ["root-cert"], ["ca-cert"], "-auth_level", "2"),
     "PSS signature using SHA256 and auth level 2");
 
-# ED25519 certificate from draft-ietf-curdle-pkix-04
-ok(verify("ee-ed25519", "sslserver", ["root-ed25519"], []),
-   "ED25519 signature");
+SKIP: {
+    skip "Ed25519 is not supported by this OpenSSL build", 1
+             if disabled("ec");
+
+    # ED25519 certificate from draft-ietf-curdle-pkix-04
+    ok(verify("ee-ed25519", "sslserver", ["root-ed25519"], []),
+       "ED25519 signature");
+
+}