[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  bd6eba79d70677f891f1bb55b6f5bc5602c47cbc (commit)
      from  4a089bbdf11f9e231cc68f42bba934c954d81a49 (commit)


- Log -----------------------------------------------------------------
commit bd6eba79d70677f891f1bb55b6f5bc5602c47cbc
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Nov 1 17:09:06 2017 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4643)

-----------------------------------------------------------------------

Summary of changes:
 apps/x509.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/x509.c b/apps/x509.c
index 850776f..001c395 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"},