summaryrefslogtreecommitdiffstats
path: root/apps/x509.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2017-11-01 17:09:06 +0100
committerMatt Caswell <matt@openssl.org>2017-11-02 10:47:51 +0000
commitbd6eba79d70677f891f1bb55b6f5bc5602c47cbc (patch)
tree941d3f7b7415196e40e7afcd1ff0dbb278305f2e /apps/x509.c
parent4a089bbdf11f9e231cc68f42bba934c954d81a49 (diff)
Fix small but important regression
In OpenSSL pre 1.1.0, 'openssl x509 -CAkeyformat engine' was possible and supported. In 1.1.0, a small typo ('F' instead of 'f') removed that possibility. This restores the pre 1.1.0 behavior. Fixes #4366 Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4643)
Diffstat (limited to 'apps/x509.c')
-rw-r--r--apps/x509.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/x509.c b/apps/x509.c
index 850776fef2..001c3959aa 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -129,7 +129,7 @@ const OPTIONS x509_options[] = {
{"checkemail", OPT_CHECKEMAIL, 's', "Check certificate matches email"},
{"checkip", OPT_CHECKIP, 's', "Check certificate matches ipaddr"},
{"CAform", OPT_CAFORM, 'F', "CA format - default PEM"},
- {"CAkeyform", OPT_CAKEYFORM, 'F', "CA key format - default PEM"},
+ {"CAkeyform", OPT_CAKEYFORM, 'f', "CA key format - default PEM"},
{"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
{"force_pubkey", OPT_FORCE_PUBKEY, '<', "Force the Key to put inside certificate"},
{"next_serial", OPT_NEXT_SERIAL, '-', "Increment current certificate serial number"},