mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

APPS/dhparam: fix case where infile and outfile are the same

Browse Source 
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25552)
This commit is contained in:
Dr. David von Oheimb 2024-09-27 07:31:36 +02:00 committed by Tomas Mraz
parent 93d1bb6dff
commit 9ae1e6596f
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/dhparam.c
View File

@ -179,10 +179,6 @@ int dhparam_main(int argc, char **argv)
goto end;
}
out = bio_open_default(outfile, 'w', outformat);
if (out == NULL)
goto end;
/* DH parameters */
if (num && !g)
g = 2;
@ -322,6 +318,10 @@ int dhparam_main(int argc, char **argv)
}
}
out = bio_open_default(outfile, 'w', outformat);
if (out == NULL)
goto end;
if (text)
EVP_PKEY_print_params(out, pkey, 4, NULL);

10
doc/man1/openssl-dhparam.pod.in
View File

@ -50,14 +50,16 @@ See L<openssl-format-options(1)> for details.
=item B<-in> I<filename>
This specifies the input filename to read parameters from or standard input if
This specifies the input file to read parameters from or standard input if
this option is not specified.
=item B<-out> I<filename>
This specifies the output filename parameters to. Standard output is used
if this option is not present. The output filename should B<not> be the same
as the input filename.
This specifies the output file to write parameters to.
Standard output is used if this option is not present.
The output filename can be the same as the input filename,
which leads to replacing the file contents.
Note that file I/O is not atomic. The output file is truncated and then written.
=item B<-dsaparam>

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

@ -10,6 +10,8 @@
use strict;
use warnings;
use File::Copy;
use File::Compare qw/compare/;
use OpenSSL::Test qw(:DEFAULT data_file srctop_file);
use OpenSSL::Test::Utils;
@ -19,7 +21,7 @@ setup("test_dhparam");
plan skip_all => "DH is not supported in this build"
if disabled("dh");
plan tests => 21;
plan tests => 23;
my $fipsconf = srctop_file("test", "fips-and-base.cnf");
@ -210,6 +212,13 @@ SKIP: {
delete $ENV{OPENSSL_CONF};
}
my $input = data_file("pkcs3-2-1024.pem");
ok(run(app(["openssl", "dhparam", "-noout", "-text"],
stdin => data_file("pkcs3-2-1024.pem"))),
stdin => $input)),
"stdinbuffer input test that uses BIO_gets");
my $inout = "inout.pem";
copy($input, $inout);
ok(run(app(['openssl', 'dhparam', '-in', $inout, '-out', $inout])),
"identical infile and outfile");
ok(!compare($input, $inout), "converted file $inout did not change");