[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ea24bb0ac5afee1cb7807752a674cb8a858545db (commit)
      from  0db1fb3fc13c4b1a2b916efbb374f40579b1398f (commit)


- Log -----------------------------------------------------------------
commit ea24bb0ac5afee1cb7807752a674cb8a858545db
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Jan 21 14:44:52 2017 +0100

    Fix no-tls1_2
    
    It seems that the ssl test 20-cert-select.conf dislikes the lack of TLSv1.2
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2268)

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

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

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index fd58d5e..ce1cc22 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -80,7 +80,7 @@ my %skip = (
   "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
   "18-dtls-renegotiate.conf" => $no_dtls,
   "19-mac-then-encrypt.conf" => $no_pre_tls1_3,
-  "20-cert-select.conf" => $no_ec,
+  "20-cert-select.conf" => disabled("tls1_2") || $no_ec,
 );
 
 foreach my $conf (@conf_files) {