diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-12-25 17:57:32 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-12-29 15:42:22 +0100 |
| commit | ac6eb1529349e3daf69c686c9a9f778a15fda592 (patch) | |
| tree | 3c78390c8333349afbf020007173aa8390559ec3 /test | |
| parent | 7638e378465433ecfc4333ef3033e59c77cb0006 (diff) | |
80-test_ssl_new.t: Make 19-mac-then-encrypt.conf work without TLSv1.2
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2144)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_ssl_new.t | 3 | ||||
| -rw-r--r-- | test/ssl-tests/19-mac-then-encrypt.conf.in | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 7b624acd22..08ee494c89 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -57,6 +57,7 @@ my %conf_dependent_tests = ( "07-dtls-protocol-version.conf" => !$is_default_dtls, "10-resumption.conf" => !$is_default_tls, "11-dtls_resumption.conf" => !$is_default_dtls, + "19-mac-then-encrypt.conf" => !$is_default_tls, ); # Add your test here if it should be skipped for some compile-time @@ -78,7 +79,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" => $no_pre_tls1_3 + "19-mac-then-encrypt.conf" => $no_pre_tls1_3, ); foreach my $conf (@conf_files) { diff --git a/test/ssl-tests/19-mac-then-encrypt.conf.in b/test/ssl-tests/19-mac-then-encrypt.conf.in index 096423bde2..d51cfa3ea7 100644 --- a/test/ssl-tests/19-mac-then-encrypt.conf.in +++ b/test/ssl-tests/19-mac-then-encrypt.conf.in @@ -11,6 +11,8 @@ package ssltests; +use OpenSSL::Test::Utils; + our @tests = ( { name => "disable-encrypt-then-mac-server-sha", @@ -52,6 +54,9 @@ our @tests = ( "ExpectedResult" => "Success", }, }, +); + +my @tests_tls1_2 = ( { name => "disable-encrypt-then-mac-server-sha2", server => { @@ -93,3 +98,5 @@ our @tests = ( }, }, ); + +push @tests, @tests_tls1_2 unless disabled("tls1_2"); |