apps x509: restrict CAkeyform option to OPT_FMT_PDE
authorBastian Germann <bage@linutronix.de>
Mon, 17 Feb 2020 11:50:08 +0000 (12:50 +0100)
committerTomas Mraz <tmraz@fedoraproject.org>
Thu, 27 Feb 2020 11:18:03 +0000 (12:18 +0100)
commit3bd75cfafd94cb90b5422c69d45b1320802effac
tree990d5cecd7ca6319a65578336e2a6962a330eb93
parent605a0c709f4d50497a1c49ee117a0ec4bb956d58
apps x509: restrict CAkeyform option to OPT_FMT_PDE

CAkeyform may be set to PEM, DER or ENGINE, but the current options
are not using the proper optionformat 'E' (OPT_FMT_PDE) for this.

Set the valtype for CAkeyform to 'E' and use OPT_FMT_PDE when extracting
the option value.

This amends bf4006a6f9 ("Fix regression on x509 keyform argument") which
did the same thing for keyform and changed the manpage synopsis entries
for both keyform and CAkeyform but did not change the option section.
Hence, change the option section.

CLA: trivial

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11172)
apps/x509.c
doc/man1/x509.pod