summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-03-18 17:43:58 +0000
committerMatt Caswell <matt@openssl.org>2016-03-21 14:28:56 +0000
commit83ae8124de62f5f6d07dd4b0e6043c8a196b789e (patch)
treefbd294de40aaad6af48c1755918fa505a39e99d4 /test
parentb75ac3c2a3ae8549eb8afb701c1fc7a55c2afdb5 (diff)
Fix no-dsa
Misc fixes for no-dsa. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test')
-rw-r--r--test/recipes/80-test_cms.t8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 8dc6e9039a..21926d430e 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -13,8 +13,8 @@ setup("test_cms");
my $smdir = srctop_dir("test", "smime-certs");
my $smcont = srctop_file("test", "smcont.txt");
-my ($no_des, $no_dh, $no_ec, $no_ec2m, $no_rc2, $no_zlib)
- = disabled qw/des dh ec ec2m rc2 zlib/;
+my ($no_des, $no_dh, $no_dsa, $no_ec, $no_ec2m, $no_rc2, $no_zlib)
+ = disabled qw/des dh dsa ec ec2m rc2 zlib/;
plan tests => 4;
@@ -59,7 +59,7 @@ my @smime_pkcs7_tests = (
"-content", $smcont ]
],
- [ "signed detached content DER format, add RSA signer",
+ [ "signed detached content DER format, add RSA signer (with DSA existing)",
[ "-resign", "-inform", "DER", "-in", "test.cms", "-outform", "DER",
"-signer", catfile($smdir, "smrsa1.pem"), "-out", "test2.cms" ],
[ "-verify", "-in", "test2.cms", "-inform", "DER",
@@ -477,6 +477,8 @@ sub check_availability {
if ($no_rc2 && $tnam =~ /RC2/);
return "$tnam: skipped, DES disabled\n"
if ($no_des && $tnam =~ /DES/);
+ return "$tnam: skipped, DSA disabled\n"
+ if ($no_dsa && $tnam =~ / DSA/);
return "";
}