The branch master has been updated via c404e4fab3b4497a2d04bc9c171c5460b940bf91 (commit) via 872b7979c7c5f5d1f412964eb57507505c7a2ff9 (commit) from 3b9e47695f66e83b162d6d78f9a3c20e4464322d (commit)
- Log ----------------------------------------------------------------- commit c404e4fab3b4497a2d04bc9c171c5460b940bf91 Author: Tomas Mraz <to...@openssl.org> Date: Tue Apr 27 11:49:44 2021 +0200 Add test case for openssl crl -noout -hash output Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15044) commit 872b7979c7c5f5d1f412964eb57507505c7a2ff9 Author: Tomas Mraz <to...@openssl.org> Date: Tue Apr 27 11:44:05 2021 +0200 crl: noout is not an output item Fixes #15034 Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15044) ----------------------------------------------------------------------- Summary of changes: apps/crl.c | 2 +- test/recipes/25-test_crl.t | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/crl.c b/apps/crl.c index 7f09d476c1..fbdd2a896c 100644 --- a/apps/crl.c +++ b/apps/crl.c @@ -177,7 +177,7 @@ int crl_main(int argc, char **argv) nextupdate = ++num; break; case OPT_NOOUT: - noout = ++num; + noout = 1; break; case OPT_FINGERPRINT: fingerprint = ++num; diff --git a/test/recipes/25-test_crl.t b/test/recipes/25-test_crl.t index 128ad116ff..a17383f043 100644 --- a/test/recipes/25-test_crl.t +++ b/test/recipes/25-test_crl.t @@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/; setup("test_crl"); -plan tests => 7; +plan tests => 8; require_ok(srctop_file('test','recipes','tconversion.pl')); @@ -35,6 +35,9 @@ ok(compare1stline([qw{openssl crl -noout -fingerprint -in}, ok(compare1stline([qw{openssl crl -noout -fingerprint -sha256 -in}, srctop_file('test', 'testcrl.pem')], 'SHA2-256 Fingerprint=B3:A9:FD:A7:2E:8C:3D:DF:D0:F1:C3:1A:96:60:B5:FD:B0:99:7C:7F:0E:E4:34:F5:DB:87:62:36:BC:F1:BC:1B')); +ok(compare1stline([qw{openssl crl -noout -hash -in}, + srctop_file('test', 'testcrl.pem')], + '106cd822')); ok(run(app(["openssl", "crl", "-text", "-in", $pem, "-out", $out, "-nameopt", "utf8"])));