[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  0a307450bfdd570a09235a7ba16d6c8243bbe275 (commit)
      from  1beca67688189f6542c7d08233c28e8fab73dba7 (commit)


- Log -----------------------------------------------------------------
commit 0a307450bfdd570a09235a7ba16d6c8243bbe275
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Aug 24 13:54:05 2016 +0100

    Fix no-ec2m
    
    The new curves test did not take into account no-ec2m
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 test/recipes/80-test_ssl_new.t | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 29e490d..175b3b2 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -43,6 +43,7 @@ my $no_dtls = alldisabled(available_protocols("dtls"));
 my $no_npn = disabled("nextprotoneg");
 my $no_ct = disabled("ct");
 my $no_ec = disabled("ec");
+my $no_ec2m = disabled("ec2m");
 
 # Add your test here if the test conf.in generates test cases and/or
 # expectations dynamically based on the OpenSSL compile-time config.
@@ -68,7 +69,7 @@ my %skip = (
   # special-casing for.
   # We should review this once we have TLS 1.3.
   "13-fragmentation.conf" => disabled("tls1_2"),
-  "14-curves.conf" => disabled("tls1_2") || $no_ec
+  "14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m
 );
 
 foreach my $conf (@conf_files) {