80-test_ssl_new.t (openssl-1.1.1o) | : | 80-test_ssl_new.t (openssl-1.1.1p) | ||
---|---|---|---|---|
#! /usr/bin/env perl | #! /usr/bin/env perl | |||
# Copyright 2015-2019 The OpenSSL Project Authors. All Rights Reserved. | # Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved. | |||
# | # | |||
# Licensed under the OpenSSL license (the "License"). You may not use | # Licensed under the OpenSSL license (the "License"). You may not use | |||
# this file except in compliance with the License. You can obtain a copy | # this file except in compliance with the License. You can obtain a copy | |||
# in the file LICENSE in the source distribution or at | # in the file LICENSE in the source distribution or at | |||
# https://www.openssl.org/source/license.html | # https://www.openssl.org/source/license.html | |||
use strict; | use strict; | |||
use warnings; | use warnings; | |||
use File::Basename; | use File::Basename; | |||
skipping to change at line 30 | skipping to change at line 30 | |||
$ENV{TEST_CERTS_DIR} = srctop_dir("test", "certs"); | $ENV{TEST_CERTS_DIR} = srctop_dir("test", "certs"); | |||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf"); | $ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf"); | |||
my @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.conf.in")); | my @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.conf.in")); | |||
map { s/;.*// } @conf_srcs if $^O eq "VMS"; | map { s/;.*// } @conf_srcs if $^O eq "VMS"; | |||
my @conf_files = map { basename($_, ".in") } @conf_srcs; | my @conf_files = map { basename($_, ".in") } @conf_srcs; | |||
map { s/\^// } @conf_files if $^O eq "VMS"; | map { s/\^// } @conf_files if $^O eq "VMS"; | |||
# We hard-code the number of tests to double-check that the globbing above | # We hard-code the number of tests to double-check that the globbing above | |||
# finds all files as expected. | # finds all files as expected. | |||
plan tests => 29; # = scalar @conf_srcs | plan tests => 30; # = scalar @conf_srcs | |||
# Some test results depend on the configuration of enabled protocols. We only | # Some test results depend on the configuration of enabled protocols. We only | |||
# verify generated sources in the default configuration. | # verify generated sources in the default configuration. | |||
my $is_default_tls = (disabled("ssl3") && !disabled("tls1") && | my $is_default_tls = (disabled("ssl3") && !disabled("tls1") && | |||
!disabled("tls1_1") && !disabled("tls1_2") && | !disabled("tls1_1") && !disabled("tls1_2") && | |||
!disabled("tls1_3")); | !disabled("tls1_3")); | |||
my $is_default_dtls = (!disabled("dtls1") && !disabled("dtls1_2")); | my $is_default_dtls = (!disabled("dtls1") && !disabled("dtls1_2")); | |||
my @all_pre_tls1_3 = ("ssl3", "tls1", "tls1_1", "tls1_2"); | my @all_pre_tls1_3 = ("ssl3", "tls1", "tls1_1", "tls1_2"); | |||
skipping to change at line 72 | skipping to change at line 72 | |||
"11-dtls_resumption.conf" => !$is_default_dtls || !disabled("sctp"), | "11-dtls_resumption.conf" => !$is_default_dtls || !disabled("sctp"), | |||
"16-dtls-certstatus.conf" => !$is_default_dtls || !disabled("sctp"), | "16-dtls-certstatus.conf" => !$is_default_dtls || !disabled("sctp"), | |||
"17-renegotiate.conf" => disabled("tls1_2"), | "17-renegotiate.conf" => disabled("tls1_2"), | |||
"18-dtls-renegotiate.conf" => disabled("dtls1_2") || !disabled("sctp"), | "18-dtls-renegotiate.conf" => disabled("dtls1_2") || !disabled("sctp"), | |||
"19-mac-then-encrypt.conf" => !$is_default_tls, | "19-mac-then-encrypt.conf" => !$is_default_tls, | |||
"20-cert-select.conf" => !$is_default_tls || $no_dh || $no_dsa, | "20-cert-select.conf" => !$is_default_tls || $no_dh || $no_dsa, | |||
"22-compression.conf" => !$is_default_tls, | "22-compression.conf" => !$is_default_tls, | |||
"25-cipher.conf" => disabled("poly1305") || disabled("chacha"), | "25-cipher.conf" => disabled("poly1305") || disabled("chacha"), | |||
"27-ticket-appdata.conf" => !$is_default_tls, | "27-ticket-appdata.conf" => !$is_default_tls, | |||
"28-seclevel.conf" => disabled("tls1_2") || $no_ec, | "28-seclevel.conf" => disabled("tls1_2") || $no_ec, | |||
"30-supported-groups.conf" => disabled("tls1_2") || disabled("tls1_3") | ||||
|| $no_ec || $no_ec2m | ||||
); | ); | |||
# Add your test here if it should be skipped for some compile-time | # Add your test here if it should be skipped for some compile-time | |||
# configurations. Default is $no_tls but some tests have different skip | # configurations. Default is $no_tls but some tests have different skip | |||
# conditions. | # conditions. | |||
my %skip = ( | my %skip = ( | |||
"06-sni-ticket.conf" => $no_tls_below1_3, | "06-sni-ticket.conf" => $no_tls_below1_3, | |||
"07-dtls-protocol-version.conf" => $no_dtls, | "07-dtls-protocol-version.conf" => $no_dtls, | |||
"08-npn.conf" => (disabled("tls1") && disabled("tls1_1") | "08-npn.conf" => (disabled("tls1") && disabled("tls1_1") | |||
&& disabled("tls1_2")) || $no_npn, | && disabled("tls1_2")) || $no_npn, | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 4 lines changed or added |