diff options
author | Matt Caswell <matt@openssl.org> | 2020-12-02 17:01:55 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-12-04 07:49:24 +0100 |
commit | 300e8c4bf15b8476cbe33624ef47ea228e73d472 (patch) | |
tree | a94391d4ae13eac90e8df6eb157cae1e46b6205e | |
parent | c2386b81feae22786502abb99b3b39f85e66d8a1 (diff) |
Fix no-dsa
Skip tests that require DSA to be available. While we're doing this
we also remove an OPENSSL_NO_DSA guard in the dhparam app that is no
longer necessary (even though DSA may not be present in our own providers
it could be available via a third party provider).
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13599)
-rw-r--r-- | apps/dhparam.c | 2 | ||||
-rw-r--r-- | test/recipes/20-test_dhparam.t | 52 |
2 files changed, 28 insertions, 26 deletions
diff --git a/apps/dhparam.c b/apps/dhparam.c index 58cdfd000d..ecb4e17db1 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -47,10 +47,8 @@ const OPTIONS dhparam_options[] = { OPT_SECTION("General"), {"help", OPT_HELP, '-', "Display this summary"}, {"check", OPT_CHECK, '-', "Check the DH parameters"}, -#ifndef OPENSSL_NO_DSA {"dsaparam", OPT_DSAPARAM, '-', "Read or generate DSA parameters, convert to DH"}, -#endif #ifndef OPENSSL_NO_ENGINE {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"}, #endif diff --git a/test/recipes/20-test_dhparam.t b/test/recipes/20-test_dhparam.t index 63441a5785..42eef173b7 100644 --- a/test/recipes/20-test_dhparam.t +++ b/test/recipes/20-test_dhparam.t @@ -141,27 +141,31 @@ subtest "Generate: 512 bit PKCS3 params, generator 2, explicit PEM file" => sub '-outform', 'PEM', '512' ]))); checkdhparams("gen-pkcs3-2-512.exp.pem", "PKCS3", 2, "PEM", 512); }; -subtest "Generate: 512 bit X9.42 params, generator 0, PEM file" => sub { - plan tests => 5; - ok(run(app([ 'openssl', 'dhparam', '-out', 'gen-x942-0-512.pem', - '-dsaparam', '512' ]))); - checkdhparams("gen-x942-0-512.pem", "X9.42", 0, "PEM", 512); -}; -subtest "Generate: 512 bit X9.42 params, explicit generator 2, PEM file" => sub { - plan tests => 1; - #Expected to fail - you cannot select a generator with '-dsaparam' - ok(!run(app([ 'openssl', 'dhparam', '-out', 'gen-x942-exp2-512.pem', '-2', - '-dsaparam', '512' ]))); -}; -subtest "Generate: 512 bit X9.42 params, generator 5, PEM file" => sub { - plan tests => 1; - #Expected to fail - you cannot select a generator with '-dsaparam' - ok(!run(app([ 'openssl', 'dhparam', '-out', 'gen-x942-5-512.pem', - '-5', '-dsaparam', '512' ]))); -}; -subtest "Generate: 512 bit X9.42 params, generator 0, DER file" => sub { - plan tests => 5; - ok(run(app([ 'openssl', 'dhparam', '-out', 'gen-x942-0-512.der', - '-dsaparam', '-outform', 'DER', '512' ]))); - checkdhparams("gen-x942-0-512.der", "X9.42", 0, "DER", 512); -}; +SKIP: { + skip "Skipping tests that require DSA", 4 if disabled("dsa"); + + subtest "Generate: 512 bit X9.42 params, generator 0, PEM file" => sub { + plan tests => 5; + ok(run(app([ 'openssl', 'dhparam', '-out', 'gen-x942-0-512.pem', + '-dsaparam', '512' ]))); + checkdhparams("gen-x942-0-512.pem", "X9.42", 0, "PEM", 512); + }; + subtest "Generate: 512 bit X9.42 params, explicit generator 2, PEM file" => sub { + plan tests => 1; + #Expected to fail - you cannot select a generator with '-dsaparam' + ok(!run(app([ 'openssl', 'dhparam', '-out', 'gen-x942-exp2-512.pem', '-2', + '-dsaparam', '512' ]))); + }; + subtest "Generate: 512 bit X9.42 params, generator 5, PEM file" => sub { + plan tests => 1; + #Expected to fail - you cannot select a generator with '-dsaparam' + ok(!run(app([ 'openssl', 'dhparam', '-out', 'gen-x942-5-512.pem', + '-5', '-dsaparam', '512' ]))); + }; + subtest "Generate: 512 bit X9.42 params, generator 0, DER file" => sub { + plan tests => 5; + ok(run(app([ 'openssl', 'dhparam', '-out', 'gen-x942-0-512.der', + '-dsaparam', '-outform', 'DER', '512' ]))); + checkdhparams("gen-x942-0-512.der", "X9.42", 0, "DER", 512); + }; +} |