projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix no-chacha
[openssl.git]
/
test
/
recipes
/
80-test_ssl_new.t
diff --git
a/test/recipes/80-test_ssl_new.t
b/test/recipes/80-test_ssl_new.t
index 5f4433403da959f8f35f4c79438950bf781e0c38..d1388d9b430931ce5b527487672e33ee2f904a12 100644
(file)
--- a/
test/recipes/80-test_ssl_new.t
+++ b/
test/recipes/80-test_ssl_new.t
@@
-1,5
+1,5
@@
#! /usr/bin/env perl
#! /usr/bin/env perl
-# Copyright 2015-201
6
The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-201
7
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
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
@@
-12,8
+12,7
@@
use warnings;
use File::Basename;
use File::Compare qw/compare_text/;
use File::Basename;
use File::Compare qw/compare_text/;
-use if $^O ne "VMS", 'File::Glob' => qw/glob/;
-
+use OpenSSL::Glob;
use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/;
use OpenSSL::Test::Utils qw/disabled alldisabled available_protocols/;
use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/;
use OpenSSL::Test::Utils qw/disabled alldisabled available_protocols/;
@@
-29,7
+28,7
@@
map { s/\^// } @conf_files if $^O eq "VMS";
# We hard-code the number of tests to double-check that the globbing above
# finds all files as expected.
# We hard-code the number of tests to double-check that the globbing above
# finds all files as expected.
-plan tests => 2
2
; # = scalar @conf_srcs
+plan tests => 2
5
; # = scalar @conf_srcs
# Some test results depend on the configuration of enabled protocols. We only
# verify generated sources in the default configuration.
# Some test results depend on the configuration of enabled protocols. We only
# verify generated sources in the default configuration.
@@
-55,15
+54,19
@@
my $no_ocsp = disabled("ocsp");
# expectations dynamically based on the OpenSSL compile-time config.
my %conf_dependent_tests = (
"02-protocol-version.conf" => !$is_default_tls,
# 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,
+ "04-client_auth.conf" => !$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,
"10-resumption.conf" => !$is_default_tls,
- "11-dtls_resumption.conf" => !$is_default_dtls,
+ "11-dtls_resumption.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"),
+ "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,
"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"),
);
# 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
@@
-79,7
+82,7
@@
my %skip = (
# 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 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.
+ #
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,
"13-fragmentation.conf" => disabled("tls1_2"),
"14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,
"15-certstatus.conf" => $no_tls || $no_ocsp,
@@
-89,6
+92,10
@@
my %skip = (
"20-cert-select.conf" => disabled("tls1_2") || $no_ec,
"21-key-update.conf" => disabled("tls1_3"),
"22-compression.conf" => disabled("zlib") || $no_tls,
"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")
+ && disabled("tls1_2")) || disabled("srp"),
+ "24-padding.conf" => disabled("tls1_3"),
+ "25-cipher.conf" => disabled("ec") || disabled("tls1_2"),
);
foreach my $conf (@conf_files) {
);
foreach my $conf (@conf_files) {
@@
-114,7
+121,7
@@
sub test_conf {
skip 'failure', 2 unless
ok(run(perltest(["generate_ssl_tests.pl", $input_file],
skip 'failure', 2 unless
ok(run(perltest(["generate_ssl_tests.pl", $input_file],
- interpreter_args => [ "-I", srctop_dir("
test", "testlib
")],
+ interpreter_args => [ "-I", srctop_dir("
util", "perl
")],
stdout => $tmp_file)),
"Getting output from generate_ssl_tests.pl.");
stdout => $tmp_file)),
"Getting output from generate_ssl_tests.pl.");