summaryrefslogtreecommitdiffstats
path: root/test/recipes/80-test_cms.t
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2022-11-22 15:05:45 +0100
committerTomas Mraz <tomas@openssl.org>2022-11-22 17:15:14 +0100
commit122ea851de77f761d7bc0ec5f3a7fc23e3a5d8be (patch)
tree59d4c4c8a8fd334f32298d1e7ac1d9e3eeff5125 /test/recipes/80-test_cms.t
parentc48c32807f2d945a9672c48b59bff4083885a5bc (diff)
test/recipes/80-test_cms.t: Fix the "CAdES ko" test
This test had commands that assumes that runner_loop() is used to perform the tests. These tests still run fine because Unix accepts braces in file names, but other operating systems might not. Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19731) (cherry picked from commit 20d3731006c9d29cbe17c2aedeba5e2abccfcd57)
Diffstat (limited to 'test/recipes/80-test_cms.t')
-rw-r--r--test/recipes/80-test_cms.t7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index e10e086005..f9d19df6b9 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -451,10 +451,10 @@ my @smime_cms_cades_tests = (
my @smime_cms_cades_ko_tests = (
[ "sign content DER format, RSA key, not CAdES-BES compatible",
[ @prov, "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
- "-certfile", $smroot, "-signer", $smrsa1, "-out", "{output}.cms" ],
+ "-certfile", $smroot, "-signer", $smrsa1, "-out", "cades-ko.cms" ],
"fail to verify token since requiring CAdES-BES compatibility",
- [ @prov, "-verify", "-cades", "-in", "{output}.cms", "-inform", "DER",
- "-CAfile", $smroot, "-out", "{output}.txt" ],
+ [ @prov, "-verify", "-cades", "-in", "cades-ko.cms", "-inform", "DER",
+ "-CAfile", $smroot, "-out", "cades-ko.txt" ],
\&final_compare
]
);
@@ -800,6 +800,7 @@ subtest "CAdES ko tests\n" => sub {
SKIP: {
my $skip_reason = check_availability($$_[0]);
skip $skip_reason, 1 if $skip_reason;
+ 1 while unlink "cades-ko.txt";
ok(run(app(["openssl", "cms", @{$$_[1]}])), $$_[0]);
ok(!run(app(["openssl", "cms", @{$$_[3]}])), $$_[2]);