From: Ben Kaduk <kaduk@mit.edu>
Date: Fri, 13 Oct 2017 00:20:07 +0000 (-0500)
Subject: Skip ssl-tests/19-mac-then-encrypt.conf for no-tls1_2
X-Git-Tag: OpenSSL_1_1_0g~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f1597bb5ed7271ede8afecc8299b0cb4dbb73fa4;p=oweals%2Fopenssl.git

Skip ssl-tests/19-mac-then-encrypt.conf for no-tls1_2

The second set of tests in that configuration uses the AES-SHA256
ciphers, which are only available for TLS 1.2.  Thus, when TLS 1.2
is disabled, there are no ciphers available and the handshake fails
with an internal error.  Apply the same treatment as for
13-fragmentation.conf, which uses the same ciphers.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4526)
---

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index e986c76182..dbd6aeb57a 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -76,6 +76,7 @@ my %skip = (
   "15-certstatus.conf" => $no_tls || $no_ocsp,
   "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
   "18-dtls-renegotiate.conf" => $no_dtls,
+  "19-mac-then-encrypt.conf" => disabled("tls1_2"),
 );
 
 foreach my $conf (@conf_files) {