[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e4a3d0f96800e578ddb76dcc387125df65641500 (commit)
      from  a0179d0afb621a0875ddcfd939719a9628ac4444 (commit)


- Log -----------------------------------------------------------------
commit e4a3d0f96800e578ddb76dcc387125df65641500
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 22 01:49:50 2017 +0100

    Correct the no-dh and no-dsa fix
    
    The condition wasn't quite right
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2702)

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

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 f65b5d0..8006e5f 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -60,7 +60,7 @@ my %conf_dependent_tests = (
   "10-resumption.conf" => !$is_default_tls,
   "11-dtls_resumption.conf" => !$is_default_dtls,
   "19-mac-then-encrypt.conf" => !$is_default_tls,
-  "20-cert-select.conf" => !$is_default_tls && !$no_dh && !$no_dsa,
+  "20-cert-select.conf" => !$is_default_tls || $no_dh || $no_dsa,
 );
 
 # Add your test here if it should be skipped for some compile-time