wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the new OpenSSL::Test::Utils routines.

Browse source 
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Richard Levitte 2016-01-26 02:11:55 +01:00
parent 96d2d7bc71
commit 90d48e5ea0
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/recipes/70-test_sslcertstatus.t
View file

@ -67,7 +67,7 @@ plan skip_all => "$test_name needs the engine feature enabled"
if disabled("engine"); if disabled("engine");
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
if config("no_shared"); if disabled("shared");
$ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ENGINES} = top_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';

2
test/recipes/70-test_sslextension.t
View file

@ -67,7 +67,7 @@ plan skip_all => "$test_name needs the engine feature enabled"
if disabled("engine"); if disabled("engine");
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
if config("no_shared"); if disabled("shared");
$ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ENGINES} = top_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';

2
test/recipes/70-test_sslsessiontick.t
View file

@ -68,7 +68,7 @@ plan skip_all => "$test_name needs the engine feature enabled"
if disabled("engine"); if disabled("engine");
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
if config("no_shared"); if disabled("shared");
$ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ENGINES} = top_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';

2
test/recipes/70-test_sslskewith0p.t
View file

@ -67,7 +67,7 @@ plan skip_all => "$test_name needs the engine feature enabled"
if disabled("engine"); if disabled("engine");
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
if config("no_shared"); if disabled("shared");
plan skip_all => "dh is not supported by this OpenSSL build" plan skip_all => "dh is not supported by this OpenSSL build"
if disabled("dh"); if disabled("dh");

2
test/recipes/70-test_sslvertol.t
View file

@ -67,7 +67,7 @@ plan skip_all => "$test_name needs the engine feature enabled"
if disabled("engine"); if disabled("engine");
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
if config("no_shared"); if disabled("shared");
$ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ENGINES} = top_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';

2
test/recipes/70-test_tlsextms.t
View file

@ -68,7 +68,7 @@ plan skip_all => "$test_name needs the engine feature enabled"
if disabled("engine"); if disabled("engine");
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
if config("no_shared"); if disabled("shared");
$ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ENGINES} = top_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';

10
test/recipes/80-test_ssl.t
View file

@ -14,11 +14,11 @@ setup("test_ssl");
my ($no_rsa, $no_dsa, $no_dh, $no_ec, $no_srp, $no_psk, my ($no_rsa, $no_dsa, $no_dh, $no_ec, $no_srp, $no_psk,
$no_ssl3, $no_tls1, $no_tls1_1, $no_tls1_2, $no_ssl3, $no_tls1, $no_tls1_1, $no_tls1_2,
$no_dtls, $no_dtls1, $no_dtls1_2) = $no_dtls, $no_dtls1, $no_dtls1_2) =
disabled qw/rsa dsa dh ec srp psk anydisabled qw/rsa dsa dh ec srp psk
ssl3 tls1 tls1_1 tls1_2 ssl3 tls1 tls1_1 tls1_2
dtls dtls1 dtls1_2/; dtls dtls1 dtls1_2/;
my $no_anytls = $no_ssl3 && $no_tls1 && $no_tls1_1 && $no_tls1_2; my $no_anytls = alldisabled(available_protocols("tls"));
my $no_anydtls = $no_dtls && $no_dtls1 && $no_dtls1_2; my $no_anydtls = alldisabled(available_protocols("dtls"));
plan skip_all => "No SSL/TLS/DTLS protocol is support by this OpenSSL build" plan skip_all => "No SSL/TLS/DTLS protocol is support by this OpenSSL build"
if $no_anytls && $no_anydtls; if $no_anytls && $no_anydtls;