diff options
| -rw-r--r-- | apps/x509.c | 4 | ||||
| -rw-r--r-- | doc/man1/openssl-x509.pod.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/x509.c b/apps/x509.c index b4ef74c0cf..c00753797e 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -78,7 +78,7 @@ const OPTIONS x509_options[] = { {"outform", OPT_OUTFORM, 'f', "Output format - default PEM (one of DER or PEM)"}, {"out", OPT_OUT, '>', "Output file - default stdout"}, - {"keyform", OPT_KEYFORM, 'F', "Private key format - default PEM"}, + {"keyform", OPT_KEYFORM, 'E', "Private key format - default PEM"}, {"req", OPT_REQ, '-', "Input is a certificate request, sign and output"}, OPT_SECTION("Output"), @@ -231,7 +231,7 @@ int x509_main(int argc, char **argv) goto opthelp; break; case OPT_KEYFORM: - if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &keyformat)) + if (!opt_format(opt_arg(), OPT_FMT_PDE, &keyformat)) goto opthelp; break; case OPT_CAFORM: diff --git a/doc/man1/openssl-x509.pod.in b/doc/man1/openssl-x509.pod.in index 066df4eadf..ae9957117a 100644 --- a/doc/man1/openssl-x509.pod.in +++ b/doc/man1/openssl-x509.pod.in @@ -11,9 +11,9 @@ B<openssl> B<x509> [B<-help>] [B<-inform> B<DER>|B<PEM>] [B<-outform> B<DER>|B<PEM>] -[B<-keyform> B<DER>|B<PEM>] +[B<-keyform> B<DER>|B<PEM>|B<ENGINE>] [B<-CAform> B<DER>|B<PEM>] -[B<-CAkeyform> B<DER>|B<PEM>] +[B<-CAkeyform> B<DER>|B<PEM>|B<ENGINE>] [B<-in> I<filename>] [B<-out> I<filename>] [B<-serial>] |