Latest update.
This commit is contained in:
@@ -14,6 +14,6 @@ use OpenSSL::Test::Utils;
|
||||
setup("test_internal_provider");
|
||||
|
||||
$ENV{OPENSSL_MODULES} = bldtop_dir("test");
|
||||
$ENV{OPENSSL_CONF} = bldtop_file("test", "provider_internal_test.conf");
|
||||
$ENV{OPENSSL_CONF} = bldtop_file("test", "provider_internal_test.cnf");
|
||||
|
||||
simple_test("test_internal_provider", "provider_internal_test");
|
||||
@@ -30,7 +30,7 @@ my $infile = bldtop_file('providers', platform->dso('fips'));
|
||||
$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
|
||||
|
||||
# fail if no module name
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module',
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module',
|
||||
'-provider_name', 'fips',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
'-section_name', 'fips_install'])),
|
||||
@@ -44,57 +44,57 @@ ok(!run(app(['openssl', 'fipsinstall', '-in', 'dummy.tmp', '-module', $infile,
|
||||
"fipsinstall verify fail");
|
||||
|
||||
|
||||
# output a fips.conf file containing mac data
|
||||
ok(run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
|
||||
# output a fips.cnf file containing mac data
|
||||
ok(run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
'-section_name', 'fips_install'])),
|
||||
"fipsinstall");
|
||||
|
||||
# verify the fips.conf file
|
||||
ok(run(app(['openssl', 'fipsinstall', '-in', 'fips.conf', '-module', $infile,
|
||||
# verify the fips.cnf file
|
||||
ok(run(app(['openssl', 'fipsinstall', '-in', 'fips.cnf', '-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
'-section_name', 'fips_install', '-verify'])),
|
||||
"fipsinstall verify");
|
||||
|
||||
# fail to verify the fips.conf file if a different key is used
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-in', 'fips.conf', '-module', $infile,
|
||||
# fail to verify the fips.cnf file if a different key is used
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-in', 'fips.cnf', '-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:01',
|
||||
'-section_name', 'fips_install', '-verify'])),
|
||||
"fipsinstall verify fail bad key");
|
||||
|
||||
# fail to verify the fips.conf file if a different mac digest is used
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-in', 'fips.conf', '-module', $infile,
|
||||
# fail to verify the fips.cnf file if a different mac digest is used
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-in', 'fips.cnf', '-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA512', '-macopt', 'hexkey:00',
|
||||
'-section_name', 'fips_install', '-verify'])),
|
||||
"fipsinstall verify fail incorrect digest");
|
||||
|
||||
# corrupt the module hmac
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
'-section_name', 'fips_install', '-corrupt_desc', 'HMAC'])),
|
||||
"fipsinstall fails when the module integrity is corrupted");
|
||||
|
||||
# corrupt the first digest
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
'-section_name', 'fips_install', '-corrupt_desc', 'SHA1'])),
|
||||
"fipsinstall fails when the digest result is corrupted");
|
||||
|
||||
# corrupt another digest
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
'-section_name', 'fips_install', '-corrupt_desc', 'SHA3'])),
|
||||
"fipsinstall fails when the digest result is corrupted");
|
||||
|
||||
# corrupt DRBG
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
|
||||
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
'-section_name', 'fips_install', '-corrupt_desc', 'CTR'])),
|
||||
|
||||
@@ -16,8 +16,8 @@ use File::Compare qw(compare_text);
|
||||
setup('test_conf');
|
||||
|
||||
my %input_result = (
|
||||
'dollarid_on.conf' => 'dollarid_on.txt',
|
||||
'dollarid_off.conf' => 'dollarid_off.txt',
|
||||
'dollarid_on.cnf' => 'dollarid_on.txt',
|
||||
'dollarid_off.cnf' => 'dollarid_off.txt',
|
||||
);
|
||||
|
||||
plan skip_all => 'This is unsupported for cross compiled configurations'
|
||||
|
||||
@@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
|
||||
|
||||
setup("test_req");
|
||||
|
||||
plan tests => 15;
|
||||
plan tests => 16;
|
||||
|
||||
require_ok(srctop_file('test','recipes','tconversion.pl'));
|
||||
|
||||
@@ -42,6 +42,34 @@ ok(!run(app([@addext_args, "-addext", $val, "-addext", $val2])));
|
||||
ok(!run(app([@addext_args, "-addext", $val, "-addext", $val3])));
|
||||
ok(!run(app([@addext_args, "-addext", $val2, "-addext", $val3])));
|
||||
|
||||
subtest "generating alt certificate requests with RSA" => sub {
|
||||
plan tests => 3;
|
||||
|
||||
SKIP: {
|
||||
skip "RSA is not supported by this OpenSSL build", 2
|
||||
if disabled("rsa");
|
||||
|
||||
ok(run(app(["openssl", "req",
|
||||
"-config", srctop_file("test", "test.cnf"),
|
||||
"-section", "altreq",
|
||||
"-new", "-out", "testreq-rsa.pem", "-utf8",
|
||||
"-key", srctop_file("test", "testrsa.pem")])),
|
||||
"Generating request");
|
||||
|
||||
ok(run(app(["openssl", "req",
|
||||
"-config", srctop_file("test", "test.cnf"),
|
||||
"-verify", "-in", "testreq-rsa.pem", "-noout"])),
|
||||
"Verifying signature on request");
|
||||
|
||||
ok(run(app(["openssl", "req",
|
||||
"-config", srctop_file("test", "test.cnf"),
|
||||
"-section", "altreq",
|
||||
"-verify", "-in", "testreq-rsa.pem", "-noout"])),
|
||||
"Verifying signature on request");
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
subtest "generating certificate requests with RSA" => sub {
|
||||
plan tests => 2;
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ unless ($no_fips) {
|
||||
$ENV{OPENSSL_CONF_INCLUDE} = bldtop_dir("providers");
|
||||
|
||||
ok(run(app(['openssl', 'fipsinstall',
|
||||
'-out', bldtop_file('providers', 'fipsinstall.conf'),
|
||||
'-out', bldtop_file('providers', 'fipsinstall.cnf'),
|
||||
'-module', $infile,
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
|
||||
@@ -48,7 +48,7 @@ my @testdata = (
|
||||
unless ($no_fips) {
|
||||
push @setups, {
|
||||
cmd => app(['openssl', 'fipsinstall',
|
||||
'-out', bldtop_file('providers', 'fipsinstall.conf'),
|
||||
'-out', bldtop_file('providers', 'fipsinstall.cnf'),
|
||||
'-module', bldtop_file('providers', platform->dso('fips')),
|
||||
'-provider_name', 'fips', '-mac_name', 'HMAC',
|
||||
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#! /usr/bin/env perl
|
||||
# Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||
# this file except in compliance with the License. You can obtain a copy
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,5 @@
|
||||
-----BEGIN PRIVATE KEY-----
|
||||
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgM9BDg6mJVgPS1/5r
|
||||
AW/kWcwNmiRshhsu3EtNNUPhG62hRANCAAQbk2dVHFWfY9EipNjRCmBtAqV3V8ij
|
||||
R3M6aggoOb3J0oDs6acIKXEvyVaC7pqFD21/WV+M0ZYL3yk+SQeIP5op
|
||||
-----END PRIVATE KEY-----
|
||||
@@ -0,0 +1,13 @@
|
||||
Private-Key: (256 bit)
|
||||
priv:
|
||||
33:d0:43:83:a9:89:56:03:d2:d7:fe:6b:01:6f:e4:
|
||||
59:cc:0d:9a:24:6c:86:1b:2e:dc:4b:4d:35:43:e1:
|
||||
1b:ad
|
||||
pub:
|
||||
04:1b:93:67:55:1c:55:9f:63:d1:22:a4:d8:d1:0a:
|
||||
60:6d:02:a5:77:57:c8:a3:47:73:3a:6a:08:28:39:
|
||||
bd:c9:d2:80:ec:e9:a7:08:29:71:2f:c9:56:82:ee:
|
||||
9a:85:0f:6d:7f:59:5f:8c:d1:96:0b:df:29:3e:49:
|
||||
07:88:3f:9a:29
|
||||
ASN1 OID: prime256v1
|
||||
NIST CURVE: P-256
|
||||
Binary file not shown.
@@ -0,0 +1,4 @@
|
||||
-----BEGIN PUBLIC KEY-----
|
||||
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEG5NnVRxVn2PRIqTY0QpgbQKld1fI
|
||||
o0dzOmoIKDm9ydKA7OmnCClxL8lWgu6ahQ9tf1lfjNGWC98pPkkHiD+aKQ==
|
||||
-----END PUBLIC KEY-----
|
||||
@@ -0,0 +1,9 @@
|
||||
Public-Key: (256 bit)
|
||||
pub:
|
||||
04:1b:93:67:55:1c:55:9f:63:d1:22:a4:d8:d1:0a:
|
||||
60:6d:02:a5:77:57:c8:a3:47:73:3a:6a:08:28:39:
|
||||
bd:c9:d2:80:ec:e9:a7:08:29:71:2f:c9:56:82:ee:
|
||||
9a:85:0f:6d:7f:59:5f:8c:d1:96:0b:df:29:3e:49:
|
||||
07:88:3f:9a:29
|
||||
ASN1 OID: prime256v1
|
||||
NIST CURVE: P-256
|
||||
@@ -28,7 +28,7 @@ plan skip_all => "$test_name needs TLSv1.3 or TLSv1.2 enabled"
|
||||
if disabled("tls1_3") && disabled("tls1_2");
|
||||
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.cnf");
|
||||
|
||||
use constant {
|
||||
MULTIPLE_COMPRESSIONS => 0,
|
||||
|
||||
@@ -30,7 +30,7 @@ plan skip_all => "$test_name needs TLS enabled"
|
||||
|| (!disabled("tls1_3") && disabled("tls1_2"));
|
||||
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.cnf");
|
||||
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
undef,
|
||||
|
||||
@@ -49,7 +49,7 @@ my $proxy = TLSProxy::Proxy->new(
|
||||
);
|
||||
|
||||
#We're just testing various negative and unusual scenarios here. ssltest with
|
||||
#02-protocol-version.conf should check all the various combinations of normal
|
||||
#02-protocol-version.cnf should check all the various combinations of normal
|
||||
#version neg
|
||||
|
||||
#Test 1: An empty supported_versions extension should not succeed
|
||||
|
||||
@@ -32,7 +32,7 @@ plan skip_all => "$test_name needs EC enabled"
|
||||
if disabled("ec");
|
||||
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.cnf");
|
||||
|
||||
|
||||
@handmessages = (
|
||||
|
||||
@@ -32,7 +32,7 @@ plan skip_all => "$test_name needs EC enabled"
|
||||
if disabled("ec");
|
||||
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.cnf");
|
||||
|
||||
|
||||
@handmessages = (
|
||||
|
||||
@@ -28,7 +28,7 @@ plan skip_all => "$test_name needs TLSv1.3 enabled"
|
||||
if disabled("tls1_3");
|
||||
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.cnf");
|
||||
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
undef,
|
||||
|
||||
@@ -11,7 +11,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file srctop_dir/;
|
||||
use OpenSSL::Test::Simple;
|
||||
|
||||
setup("test_ct");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.cnf");
|
||||
$ENV{CT_DIR} = srctop_dir("test", "ct");
|
||||
$ENV{CERTS_DIR} = srctop_dir("test", "certs");
|
||||
simple_test("test_ct", "ct_test", "ct", "ec");
|
||||
@@ -19,9 +19,9 @@ 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");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.cnf");
|
||||
|
||||
my @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.conf.in"));
|
||||
my @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.cnf.in"));
|
||||
map { s/;.*// } @conf_srcs if $^O eq "VMS";
|
||||
my @conf_files = map { basename($_, ".in") } @conf_srcs;
|
||||
map { s/\^// } @conf_files if $^O eq "VMS";
|
||||
@@ -54,56 +54,56 @@ 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 || !$is_default_dtls
|
||||
"02-protocol-version.cnf" => !$is_default_tls,
|
||||
"04-client_auth.cnf" => !$is_default_tls || !$is_default_dtls
|
||||
|| !disabled("sctp"),
|
||||
"05-sni.conf" => disabled("tls1_1"),
|
||||
"07-dtls-protocol-version.conf" => !$is_default_dtls || !disabled("sctp"),
|
||||
"10-resumption.conf" => !$is_default_tls || $no_ec,
|
||||
"11-dtls_resumption.conf" => !$is_default_dtls || !disabled("sctp"),
|
||||
"16-dtls-certstatus.conf" => !$is_default_dtls || !disabled("sctp"),
|
||||
"17-renegotiate.conf" => disabled("tls1_2"),
|
||||
"18-dtls-renegotiate.conf" => disabled("dtls1_2") || !disabled("sctp"),
|
||||
"19-mac-then-encrypt.conf" => !$is_default_tls,
|
||||
"20-cert-select.conf" => !$is_default_tls || $no_dh || $no_dsa,
|
||||
"22-compression.conf" => !$is_default_tls,
|
||||
"25-cipher.conf" => disabled("poly1305") || disabled("chacha"),
|
||||
"27-ticket-appdata.conf" => !$is_default_tls,
|
||||
"28-seclevel.conf" => disabled("tls1_2") || $no_ec,
|
||||
"30-extended-master-secret.conf" => disabled("tls1_2"),
|
||||
"05-sni.cnf" => disabled("tls1_1"),
|
||||
"07-dtls-protocol-version.cnf" => !$is_default_dtls || !disabled("sctp"),
|
||||
"10-resumption.cnf" => !$is_default_tls || $no_ec,
|
||||
"11-dtls_resumption.cnf" => !$is_default_dtls || !disabled("sctp"),
|
||||
"16-dtls-certstatus.cnf" => !$is_default_dtls || !disabled("sctp"),
|
||||
"17-renegotiate.cnf" => disabled("tls1_2"),
|
||||
"18-dtls-renegotiate.cnf" => disabled("dtls1_2") || !disabled("sctp"),
|
||||
"19-mac-then-encrypt.cnf" => !$is_default_tls,
|
||||
"20-cert-select.cnf" => !$is_default_tls || $no_dh || $no_dsa,
|
||||
"22-compression.cnf" => !$is_default_tls,
|
||||
"25-cipher.cnf" => disabled("poly1305") || disabled("chacha"),
|
||||
"27-ticket-appdata.cnf" => !$is_default_tls,
|
||||
"28-seclevel.cnf" => disabled("tls1_2") || $no_ec,
|
||||
"30-extended-master-secret.cnf" => disabled("tls1_2"),
|
||||
);
|
||||
|
||||
# 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 = (
|
||||
"06-sni-ticket.conf" => $no_tls_below1_3,
|
||||
"07-dtls-protocol-version.conf" => $no_dtls,
|
||||
"08-npn.conf" => (disabled("tls1") && disabled("tls1_1")
|
||||
"06-sni-ticket.cnf" => $no_tls_below1_3,
|
||||
"07-dtls-protocol-version.cnf" => $no_dtls,
|
||||
"08-npn.cnf" => (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,
|
||||
"10-resumption.cnf" => disabled("tls1_1") || disabled("tls1_2"),
|
||||
"11-dtls_resumption.cnf" => disabled("dtls1") || disabled("dtls1_2"),
|
||||
"12-ct.cnf" => $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.
|
||||
# TODO(TLS 1.3): 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,
|
||||
"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,
|
||||
"21-key-update.conf" => disabled("tls1_3"),
|
||||
"22-compression.conf" => disabled("zlib") || $no_tls,
|
||||
"23-srp.conf" => (disabled("tls1") && disabled ("tls1_1")
|
||||
"13-fragmentation.cnf" => disabled("tls1_2"),
|
||||
"14-curves.cnf" => disabled("tls1_2") || $no_ec || $no_ec2m,
|
||||
"15-certstatus.cnf" => $no_tls || $no_ocsp,
|
||||
"16-dtls-certstatus.cnf" => $no_dtls || $no_ocsp,
|
||||
"17-renegotiate.cnf" => $no_tls_below1_3,
|
||||
"18-dtls-renegotiate.cnf" => $no_dtls,
|
||||
"19-mac-then-encrypt.cnf" => $no_pre_tls1_3,
|
||||
"20-cert-select.cnf" => disabled("tls1_2") || $no_ec,
|
||||
"21-key-update.cnf" => disabled("tls1_3"),
|
||||
"22-compression.cnf" => disabled("zlib") || $no_tls,
|
||||
"23-srp.cnf" => (disabled("tls1") && disabled ("tls1_1")
|
||||
&& disabled("tls1_2")) || disabled("srp"),
|
||||
"24-padding.conf" => disabled("tls1_3"),
|
||||
"25-cipher.conf" => disabled("ec") || disabled("tls1_2"),
|
||||
"26-tls13_client_auth.conf" => disabled("tls1_3"),
|
||||
"29-dtls-sctp-label-bug.conf" => disabled("sctp") || disabled("sock"),
|
||||
"24-padding.cnf" => disabled("tls1_3"),
|
||||
"25-cipher.cnf" => disabled("ec") || disabled("tls1_2"),
|
||||
"26-tls13_client_auth.cnf" => disabled("tls1_3"),
|
||||
"29-dtls-sctp-label-bug.cnf" => disabled("sctp") || disabled("sock"),
|
||||
);
|
||||
|
||||
foreach my $conf (@conf_files) {
|
||||
@@ -133,7 +133,7 @@ sub test_conf {
|
||||
"Getting output from generate_ssl_tests.pl.");
|
||||
|
||||
SKIP: {
|
||||
# Test 2. Compare against existing output in test/ssl_tests.conf.
|
||||
# Test 2. Compare against existing output in test/ssl_tests.cnf.
|
||||
skip "Skipping generated source test for $conf", 1
|
||||
if !$check_source;
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ use OpenSSL::Test::Utils;
|
||||
|
||||
setup("test_ssl");
|
||||
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
||||
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.cnf");
|
||||
|
||||
my ($no_rsa, $no_dsa, $no_dh, $no_ec, $no_psk,
|
||||
$no_ssl3, $no_tls1, $no_tls1_1, $no_tls1_2, $no_tls1_3,
|
||||
|
||||
@@ -15,5 +15,5 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
|
||||
setup("test_ssl_test_ctx");
|
||||
|
||||
plan tests => 1;
|
||||
ok(run(test(["ssl_test_ctx_test", srctop_file("test", "ssl_test_ctx_test.conf")])),
|
||||
"running ssl_test_ctx_test ssl_test_ctx_test.conf");
|
||||
ok(run(test(["ssl_test_ctx_test", srctop_file("test", "ssl_test_ctx_test.cnf")])),
|
||||
"running ssl_test_ctx_test ssl_test_ctx_test.cnf");
|
||||
@@ -31,7 +31,7 @@ plan skip_all => "No test GOST engine found"
|
||||
plan tests => 1;
|
||||
|
||||
$ENV{OPENSSL_CONF} = srctop_file("test", "recipes", "90-test_gost_data",
|
||||
"gost.conf");
|
||||
"gost.cnf");
|
||||
|
||||
ok(run(test(["gosttest",
|
||||
srctop_file("test", "recipes", "90-test_gost_data",
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
# Example configuration file using includes.
|
||||
#
|
||||
|
||||
.include [.conf-includes]
|
||||
.include [.cnf-includes]
|
||||
Reference in New Issue
Block a user