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

test/recipes/15-test_gendh.t: don't try DER params

Browse Source 
There is no option to output DH params in DER form.  -outform doesn't
apply to -genparam with 'openssl genpkey', and it shouldn't.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13266)
This commit is contained in:
Richard Levitte 2020-10-28 19:15:40 +01:00
parent 231849bc9c
commit f79289389e
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/man1/openssl-genpkey.pod.in
View File

@ -47,9 +47,11 @@ standard output is used.
=item B<-outform> B<DER>|B<PEM>
The output format; the default is B<PEM>.
The output format, except when B<-genparam> is given; the default is B<PEM>.
See L<openssl(1)/Format Options> for details.
When B<-genparam> is given, B<-outform> is ignored.
=item B<-pass> I<arg>
The output file password source. For more information about the format of I<arg>

20
test/recipes/15-test_gendh.t
View File

@ -18,7 +18,7 @@ setup("test_gendh");
plan skip_all => "This test is unsupported in a no-dh build" if disabled("dh");
plan tests => 13;
plan tests => 12;
ok(run(app([ 'openssl', 'genpkey', '-genparam',
'-algorithm', 'DH',
@ -54,28 +54,18 @@ ok(run(app([ 'openssl', 'genpkey', '-genparam',
'-algorithm', 'DH',
'-pkeyopt', 'gindex:1',
'-pkeyopt', 'type:fips186_4',
'-out', 'dhgen.pem'])),
'-out', 'dhgen.pem' ])),
"genpkey DH params fips186_4 PEM");
ok(run(app([ 'openssl', 'genpkey', '-genparam',
'-algorithm', 'DH',
'-pkeyopt', 'gindex:1',
'-pkeyopt', 'pbits:2048',
'-pkeyopt', 'qbits:256',
'-pkeyopt', 'type:fips186_4',
'-outform', 'DER',
'-out', 'dhgen.der'])),
"genpkey DH params fips186_4 DER");
# The seed and counter should be the ones generated from the param generation
# Just put some dummy ones in to show it works.
ok(run(app([ 'openssl', 'genpkey',
'-paramfile', 'dhgen.der',
'-paramfile', 'dhgen.pem',
'-pkeyopt', 'gindex:1',
'-pkeyopt', 'hexseed:0102030405060708090A0B0C0D0E0F1011121314',
'-pkeyopt', 'pcounter:25',
'-text'])),
"genpkey DH fips186_4 with DER params");
'-text' ])),
"genpkey DH fips186_4 with PEM params");
ok(!run(app([ 'openssl', 'genpkey',
'-algorithm', 'DH'])),