diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-17 10:14:30 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-18 12:09:27 +0000 |
| commit | bb4cc75b1ea8fb85ed9299dd6d5124eec686359c (patch) | |
| tree | b141b8f153de3a4abedc9e2f7fccced4463f3072 | |
| parent | c4aede204e1f643f8be45f9aebc9daeb8cb378e9 (diff) | |
Fix no-rc2 in the CMS test
The CMS test uses some RC2 keys which should be skipped if the RC2 is
disabled.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | test/recipes/80-test_cms.t | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t index e3722719ec..2ce8a2c6ae 100644 --- a/test/recipes/80-test_cms.t +++ b/test/recipes/80-test_cms.t @@ -13,7 +13,8 @@ setup("test_cms"); my $smdir = srctop_dir("test", "smime-certs"); my $smcont = srctop_file("test", "smcont.txt"); -my ($no_dh, $no_ec, $no_ec2m, $no_zlib) = disabled qw/dh ec ec2m zlib/; +my ($no_dh, $no_ec, $no_ec2m, $no_rc2, $no_zlib) + = disabled qw/dh ec ec2m rc2 zlib/; plan tests => 4; @@ -465,12 +466,15 @@ sub check_availability { my $tnam = shift; return "$tnam: skipped, EC disabled\n" - if ($no_ec && $tnam =~ /ECDH/); + if ($no_ec && $tnam =~ /ECDH/); return "$tnam: skipped, ECDH disabled\n" - if ($no_ec && $tnam =~ /ECDH/); + if ($no_ec && $tnam =~ /ECDH/); return "$tnam: skipped, EC2M disabled\n" - if ($no_ec2m && $tnam =~ /K-283/); + if ($no_ec2m && $tnam =~ /K-283/); return "$tnam: skipped, DH disabled\n" - if ($no_dh && $tnam =~ /X9\.42/); + if ($no_dh && $tnam =~ /X9\.42/); + return "$tnam: skipped, RC2 disabled\n" + if ($no_rc2 && $tnam =~ /RC2/); + return ""; } |