54d028aa0f
Commit b3618f44 added a test for mac-then-encrypt. However the test fails
when running with "enable-tls1_3". The problem is that the test creates a
connection, which ends up being TLSv1.3. However it also restricts the
ciphers to a single mac-then-encrypt ciphersuite that is not TLSv1.3
compatible so the connection aborts and the test fails. Mac-then-encrypt
is not relevant to TLSv1.3, so the test should disable that protocol
version.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
136 lines
4.7 KiB
Perl
136 lines
4.7 KiB
Perl
#! /usr/bin/env perl
|
|
# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the OpenSSL license (the "License"). You may not use
|
|
# this file except in compliance with the License. You can obtain a copy
|
|
# in the file LICENSE in the source distribution or at
|
|
# https://www.openssl.org/source/license.html
|
|
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use File::Basename;
|
|
use File::Compare qw/compare_text/;
|
|
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
|
|
|
|
use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/;
|
|
use OpenSSL::Test::Utils qw/disabled alldisabled available_protocols/;
|
|
|
|
setup("test_ssl_new");
|
|
|
|
$ENV{TEST_CERTS_DIR} = srctop_dir("test", "certs");
|
|
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
|
|
|
my @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.conf.in"));
|
|
map { s/;.*// } @conf_srcs if $^O eq "VMS";
|
|
my @conf_files = map { basename($_) } @conf_srcs;
|
|
map { s/\.in// } @conf_files;
|
|
|
|
# We hard-code the number of tests to double-check that the globbing above
|
|
# finds all files as expected.
|
|
plan tests => 19; # = scalar @conf_srcs
|
|
|
|
# Some test results depend on the configuration of enabled protocols. We only
|
|
# verify generated sources in the default configuration.
|
|
my $is_default_tls = (disabled("ssl3") && !disabled("tls1") &&
|
|
!disabled("tls1_1") && !disabled("tls1_2") &&
|
|
disabled("tls1_3"));
|
|
|
|
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_pre_tls1_3 = alldisabled(@all_pre_tls1_3);
|
|
my $no_dtls = alldisabled(available_protocols("dtls"));
|
|
my $no_npn = disabled("nextprotoneg");
|
|
my $no_ct = disabled("ct");
|
|
my $no_ec = disabled("ec");
|
|
my $no_ec2m = disabled("ec2m");
|
|
my $no_ocsp = disabled("ocsp");
|
|
|
|
# Add your test here if the test conf.in generates test cases and/or
|
|
# expectations dynamically based on the OpenSSL compile-time config.
|
|
my %conf_dependent_tests = (
|
|
"02-protocol-version.conf" => !$is_default_tls,
|
|
"04-client_auth.conf" => !$is_default_tls,
|
|
"07-dtls-protocol-version.conf" => !$is_default_dtls,
|
|
"10-resumption.conf" => !$is_default_tls,
|
|
"11-dtls_resumption.conf" => !$is_default_dtls,
|
|
);
|
|
|
|
# Add your test here if it should be skipped for some compile-time
|
|
# configurations. Default is $no_tls but some tests have different skip
|
|
# conditions.
|
|
my %skip = (
|
|
"07-dtls-protocol-version.conf" => $no_dtls,
|
|
"08-npn.conf" => (disabled("tls1") && disabled("tls1_1")
|
|
&& disabled("tls1_2")) || $no_npn,
|
|
"10-resumption.conf" => disabled("tls1_1") || disabled("tls1_2"),
|
|
"11-dtls_resumption.conf" => disabled("dtls1") || disabled("dtls1_2"),
|
|
"12-ct.conf" => $no_tls || $no_ct || $no_ec,
|
|
# We could run some of these tests without TLS 1.2 if we had a per-test
|
|
# disable instruction but that's a bizarre configuration not worth
|
|
# special-casing for.
|
|
# We should review this once we have TLS 1.3.
|
|
"13-fragmentation.conf" => disabled("tls1_2"),
|
|
"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,
|
|
"18-dtls-renegotiate.conf" => $no_dtls,
|
|
"19-mac-then-encrypt.conf" => $no_pre_tls1_3
|
|
);
|
|
|
|
foreach my $conf (@conf_files) {
|
|
subtest "Test configuration $conf" => sub {
|
|
test_conf($conf,
|
|
$conf_dependent_tests{$conf} || $^O eq "VMS" ? 0 : 1,
|
|
defined($skip{$conf}) ? $skip{$conf} : $no_tls);
|
|
}
|
|
}
|
|
|
|
sub test_conf {
|
|
plan tests => 3;
|
|
|
|
my ($conf, $check_source, $skip) = @_;
|
|
|
|
my $conf_file = srctop_file("test", "ssl-tests", $conf);
|
|
my $tmp_file = "${conf}.$$.tmp";
|
|
my $run_test = 1;
|
|
|
|
SKIP: {
|
|
# "Test" 1. Generate the source.
|
|
my $input_file = $conf_file . ".in";
|
|
|
|
skip 'failure', 2 unless
|
|
ok(run(perltest(["generate_ssl_tests.pl", $input_file],
|
|
interpreter_args => [ "-I", srctop_dir("test", "testlib")],
|
|
stdout => $tmp_file)),
|
|
"Getting output from generate_ssl_tests.pl.");
|
|
|
|
SKIP: {
|
|
# Test 2. Compare against existing output in test/ssl_tests.conf.
|
|
skip "Skipping generated source test for $conf", 1
|
|
if !$check_source;
|
|
|
|
$run_test = is(cmp_text($tmp_file, $conf_file), 0,
|
|
"Comparing generated sources.");
|
|
}
|
|
|
|
# Test 3. Run the test.
|
|
skip "No tests available; skipping tests", 1 if $skip;
|
|
skip "Stale sources; skipping tests", 1 if !$run_test;
|
|
|
|
ok(run(test(["ssl_test", $tmp_file])), "running ssl_test $conf");
|
|
}
|
|
|
|
unlink glob $tmp_file;
|
|
}
|
|
|
|
sub cmp_text {
|
|
return compare_text(@_, sub {
|
|
$_[0] =~ s/\R//g;
|
|
$_[1] =~ s/\R//g;
|
|
return $_[0] ne $_[1];
|
|
});
|
|
}
|