diff options
| author | Matt Caswell <matt@openssl.org> | 2018-02-09 10:19:14 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-02-09 17:44:43 +0000 |
| commit | c423ecaa7f6d0cc77c4f121c6de7d585439bca8f (patch) | |
| tree | 8dd31481afb05f8febe065821ad74a0e17ea02df /test/recipes/80-test_ssl_new.t | |
| parent | 83739b39e55fcdd9dd395bc619b1b7fafcc32f5c (diff) | |
Fixes for no-tls1_2 and no-tls1_2-method
The no-tls1_2 option does not work properly in conjunction with TLSv1.3
being enabled (which is now the default). This commit fixes the issues.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5301)
Diffstat (limited to 'test/recipes/80-test_ssl_new.t')
| -rw-r--r-- | test/recipes/80-test_ssl_new.t | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 26bcb39c7b..bb60168993 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -40,6 +40,7 @@ my $is_default_dtls = (!disabled("dtls1") && !disabled("dtls1_2")); my @all_pre_tls1_3 = ("ssl3", "tls1", "tls1_1", "tls1_2"); my $no_tls = alldisabled(available_protocols("tls")); +my $no_tls_below1_3 = $no_tls || (disabled("tls1_2") && !disabled("tls1_3")); my $no_pre_tls1_3 = alldisabled(@all_pre_tls1_3); my $no_dtls = alldisabled(available_protocols("dtls")); my $no_npn = disabled("nextprotoneg"); @@ -73,6 +74,7 @@ my %conf_dependent_tests = ( # configurations. Default is $no_tls but some tests have different skip # conditions. my %skip = ( + "06-sni-ticket.conf" => $no_tls_below1_3, "07-dtls-protocol-version.conf" => $no_dtls, "08-npn.conf" => (disabled("tls1") && disabled("tls1_1") && disabled("tls1_2")) || $no_npn, @@ -87,6 +89,7 @@ my %skip = ( "14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m, "15-certstatus.conf" => $no_tls || $no_ocsp, "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp, + "17-renegotiate.conf" => $no_tls_below1_3, "18-dtls-renegotiate.conf" => $no_dtls, "19-mac-then-encrypt.conf" => $no_pre_tls1_3, "20-cert-select.conf" => disabled("tls1_2") || $no_ec, |