mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix no-tls1_2

Browse Source 
Misc fixes impacting no-tls1_2. Also fixes no-dtls1_2.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2016-07-22 16:36:26 +01:00
parent 3e82ae573a
commit 80f397e2c6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/recipes/70-test_sslrecords.t
View File

@ -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 TLS enabled"
if alldisabled(available_protocols("tls"));
plan skip_all => "$test_name needs TLSv1.2 enabled"
if disabled("tls1_2");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new(

3
test/recipes/80-test_ssl_new.t
View File

@ -49,7 +49,8 @@ my %conf_dependent_tests = (
my %skip = (
"07-dtls-protocol-version.conf" => $no_dtls,
"08-npn.conf" => $no_tls || $no_npn,
"11-dtls_resumption.conf" => $no_dtls,
"10-resumption.conf" => disabled("tls1_1") || disabled("tls1_2"),
"11-dtls_resumption.conf" => disabled("dtls1") || disabled("dtls1_2"),
);
foreach my $conf (@conf_files) {

2
test/sslapitest.c
View File

@ -242,7 +242,7 @@ static int execute_test_session(SSL_SESSION_TEST_FIXTURE fix)
goto end;
}
#ifndef OPENSSL_NO_TLS1_1
#if !defined(OPENSSL_NO_TLS1_1) && !defined(OPENSSL_NO_TLS1_2)
/* Force a connection failure */
SSL_CTX_set_max_proto_version(sctx, TLS1_1_VERSION);
clientssl3 = SSL_new(cctx);