[openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  e0e68f9e34585084038fba768fb2eecb5dd1ddf3 (commit)
      from  7671420d9ebd18242f571866c6adca6f8bcb2f90 (commit)


- Log -----------------------------------------------------------------
commit e0e68f9e34585084038fba768fb2eecb5dd1ddf3
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Jan 7 12:44:25 2020 -0500

    Tweak option error messages
    
    Better messages for unknown option, unknown cipher, unknown digest.
    
    Fixes #10773
    
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10774)

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

Summary of changes:
 apps/lib/opt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index 2a80e7ebf4..767f35f673 100644
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -288,7 +288,7 @@ int opt_cipher(const char *name, const EVP_CIPHER **cipherp)
     *cipherp = EVP_get_cipherbyname(name);
     if (*cipherp != NULL)
         return 1;
-    opt_printf_stderr("%s: Unrecognized flag %s\n", prog, name);
+    opt_printf_stderr("%s: Unknown cipher: %s\n", prog, name);
     return 0;
 }
 
@@ -300,7 +300,7 @@ int opt_md(const char *name, const EVP_MD **mdp)
     *mdp = EVP_get_digestbyname(name);
     if (*mdp != NULL)
         return 1;
-    opt_printf_stderr("%s: Unrecognized flag %s\n", prog, name);
+    opt_printf_stderr("%s: Unknown message digest: %s\n", prog, name);
     return 0;
 }
 
@@ -762,7 +762,7 @@ int opt_next(void)
         dunno = p;
         return unknown->retval;
     }
-    opt_printf_stderr("%s: Option unknown option -%s\n", prog, p);
+    opt_printf_stderr("%s: Unknown option: -%s\n", prog, p);
     return -1;
 }