Fix regression on x509 keyform argument
authorJussi Keranen <jussi.keranen@vincit.com>
Wed, 11 Dec 2019 13:08:04 +0000 (15:08 +0200)
committerRichard Levitte <levitte@openssl.org>
Thu, 19 Dec 2019 08:58:51 +0000 (09:58 +0100)
commit0ab6fc79a9a63370be1a615729dc2a6ed0d6c89b
treeb338cda58b57a735ca4c70cb79d3138c2904902b
parent625c781dc76df145cfd30eeff7b6de7dfcc8afc7
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)
apps/x509.c
doc/man1/openssl-x509.pod.in