diff options
| author | Jussi Keranen <jussi.keranen@vincit.com> | 2019-12-11 15:08:04 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-12-19 10:03:19 +0100 |
| commit | bf4006a6f9be691ba6eef0e8629e63369a033ccf (patch) | |
| tree | 128da9ffcfe688d87ea90ce30f9b18a476c14d9a /doc/man1 | |
| parent | a53a694c575308e1511878f3466e9d01cda6ac3a (diff) | |
Fix regression on x509 keyform argument
In OpenSSL pre 1.1.0, 'openssl x509 -keyform engine' was possible
and supported. In 1.1.0, type of keyform argument is OPT_FMT_PEMDER
which doesn't support engine. This changes type of keyform argument
to OPT_FMT_PDE which means PEM, DER or engine and updates the manpage
including keyform and CAkeyform.
This restores the pre 1.1.0 behavior.
This issue is very similar than https://github.com/openssl/openssl/issues/4366
CLA: trivial
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10609)
(cherry picked from commit 0ab6fc79a9a63370be1a615729dc2a6ed0d6c89b)
Diffstat (limited to 'doc/man1')
| -rw-r--r-- | doc/man1/x509.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man1/x509.pod b/doc/man1/x509.pod index 503d5e9fd4..a6cea337d2 100644 --- a/doc/man1/x509.pod +++ b/doc/man1/x509.pod @@ -11,7 +11,7 @@ B<openssl> B<x509> [B<-help>] [B<-inform DER|PEM>] [B<-outform DER|PEM>] -[B<-keyform DER|PEM>] +[B<-keyform DER|PEM|ENGINE>] [B<-CAform DER|PEM>] [B<-CAkeyform DER|PEM>] [B<-in filename>] |