apps x509: restrict CAkeyform option to OPT_FMT_PDE
authorBastian Germann <bage@linutronix.de>
Thu, 13 Feb 2020 10:45:50 +0000 (11:45 +0100)
committerTomas Mraz <tmraz@fedoraproject.org>
Wed, 26 Feb 2020 16:23:53 +0000 (17:23 +0100)
commitd4c3bdb0f1fffeab899926a85f1b27aabcfd9fa4
treebdc6a1a061e05ffe31ad573e2d42db4c6cc8e3f2
parent38e6c4907e3b81f05d384d2c938c55762221de63
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 0ab6fc79a9a ("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 for both of them.

CLA: trivial

Co-developed-by: Torben Hohn <torben.hohn@linutronix.de>
Signed-off-by: Torben Hohn <torben.hohn@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>
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/11085)
apps/x509.c
doc/man1/openssl-x509.pod.in