From: David Benjamin <davidben@google.com>
Date: Thu, 18 Aug 2016 04:43:05 +0000 (-0400)
Subject: Switch back to assuming TLS 1.2.
X-Git-Tag: OpenSSL_1_1_0c~115
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e4a7023aa1d713969879110caa25338390ef68e;p=oweals%2Fopenssl.git

Switch back to assuming TLS 1.2.

The TLSProxy::Record->new call hard-codes a version, like
70-test_sslrecords.t.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit f3ea8d77080580979be086d97879ebc8b72f970a)
---

diff --git a/test/recipes/70-test_sslcbcpadding.t b/test/recipes/70-test_sslcbcpadding.t
index e2df24e8d1..4db4395a58 100644
--- a/test/recipes/70-test_sslcbcpadding.t
+++ b/test/recipes/70-test_sslcbcpadding.t
@@ -23,8 +23,8 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled"
 plan skip_all => "$test_name needs the sock feature enabled"
     if disabled("sock");
 
-plan skip_all => "$test_name needs TLSv1.1 enabled"
-    if disabled("tls1_1");
+plan skip_all => "$test_name needs TLSv1.2 enabled"
+    if disabled("tls1_2");
 
 $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
 my $proxy = TLSProxy::Proxy->new(