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/pkey: 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-26 19:25:43 +02:00 committed by Tomas Mraz
parent d5c4a8aecc
commit c8359abb88
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/pkey.c
View File

@ -208,10 +208,6 @@ int pkey_main(int argc, char **argv)
goto end;
}
out = bio_open_owner(outfile, outformat, private);
if (out == NULL)
goto end;
if (pubin)
pkey = load_pubkey(infile, informat, 1, passin, e, "Public Key");
else
@ -219,6 +215,10 @@ int pkey_main(int argc, char **argv)
if (pkey == NULL)
goto end;
out = bio_open_owner(outfile, outformat, private);
if (out == NULL)
goto end;
#ifndef OPENSSL_NO_EC
if (asn1_encoding != NULL || point_format != NULL) {
OSSL_PARAM params[3], *p = params;

11
doc/man1/openssl-pkey.pod.in
View File

@ -69,8 +69,9 @@ or the public component of a key pair.
=item B<-in> I<filename>|I<uri>
This specifies the input to read a key from
This specifies the input file to read a key from
or standard input if this option is not specified.
If the key input is encrypted and B<-passin> is not given
a pass phrase will be prompted for.
@ -100,11 +101,15 @@ If the input contains no public key but a private key, its public part is used.
=item B<-out> I<filename>
This specifies the output filename to save the encoded and/or text output of key
This specifies the output file to save the encoded and/or text output of key
or standard output if this option is not specified.
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.
If any cipher option is set but no B<-passout> is given
then a pass phrase will be prompted for.
The output filename should B<not> be the same as the input filename.
When password input is interrupted, the output file is not touched.
=item B<-outform> B<DER>|B<PEM>