mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix no-dsa

Browse Source 
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)
This commit is contained in:
Matt Caswell 2020-12-02 17:01:55 +00:00 committed by Richard Levitte
parent c2386b81fe
commit 300e8c4bf1
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dhparam.c
View File

@ -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

52
test/recipes/20-test_dhparam.t
View File

@ -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);
};
}