mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-23 18:13:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

APPS: Restore the possibility to combine -pubout with -text

Browse Source 
This applies to the 'openssl pkey' command.

Fixes #15645

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15658)
This commit is contained in:
Richard Levitte 2021-06-08 12:22:31 +02:00
parent b6298a7f8d
commit 5ac6d7d21b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/pkey.c
View File

@ -175,15 +175,19 @@ int pkey_main(int argc, char **argv)
if (argc != 0)
goto opthelp;
if (noout && pubout)
BIO_printf(bio_err,
"Warning: The -pubout option is ignored with -noout\n");
if (text && text_pub)
BIO_printf(bio_err,
"Warning: The -text option is ignored with -text_pub\n");
if (traditional && (noout || outformat != FORMAT_PEM))
BIO_printf(bio_err,
"Warning: The -traditional is ignored since there is no PEM output\n");
/* -pubout and -text is the same as -text_pub */
if (!text_pub && pubout && text) {
text = 0;
text_pub = 1;
}
private = (!noout && !pubout) || (text && !text_pub);
if (ciphername != NULL) {

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

@ -131,10 +131,12 @@ option is specified then the older "traditional" format is used instead.
=item B<-pubout>
By default the encoded private and public key is output;
this option restricts the encoded output to the public components.
By default the private and public key is output;
this option restricts the output to the public components.
This option is automatically set if the input is a public key.
When combined with B<-text>, this is equivalent to B<-text_pub>.
=item B<-noout>
Do not output the key in encoded form.