diff options
| author | Matt Caswell <matt@openssl.org> | 2016-07-22 16:36:26 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-07-25 08:24:32 +0100 |
| commit | 80f397e2c6898a1987ecbb5680859d398130107b (patch) | |
| tree | 490fbb06c28ab581920ecb01a5c0e8d53b101f3d /test | |
| parent | 3e82ae573ad7a3aa5dc99be9841ca9111e584630 (diff) | |
Fix no-tls1_2
Misc fixes impacting no-tls1_2. Also fixes no-dtls1_2.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/70-test_sslrecords.t | 4 | ||||
| -rw-r--r-- | test/recipes/80-test_ssl_new.t | 3 | ||||
| -rw-r--r-- | test/sslapitest.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/test/recipes/70-test_sslrecords.t b/test/recipes/70-test_sslrecords.t index 94aabdcf6d..5a569d3052 100644 --- a/test/recipes/70-test_sslrecords.t +++ b/test/recipes/70-test_sslrecords.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 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( diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index ffffca5403..10106657cf 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -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) { diff --git a/test/sslapitest.c b/test/sslapitest.c index 8a361c1166..d36a7923d9 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -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); |