[openssl-commits] [openssl] master update

[yang.yang at baishancloud.com]

The branch master has been updated
       via  e57120128fa4e2afa4bda5022a77f73a1e3a0b27 (commit)
      from  c4734493d7da404b1747195a805c8d536dbe6910 (commit)


- Log -----------------------------------------------------------------
commit e57120128fa4e2afa4bda5022a77f73a1e3a0b27
Author: weinholtendian <45032224+weinholtendian at users.noreply.github.com>
Date:   Thu Jan 31 15:16:20 2019 +0800

    Fix error message for s_server -psk option
    
    Previously if -psk was given a bad key it would print "Not a hex
    number 's_server'".
    
    CLA: Trivial
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/8113)

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

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

diff --git a/apps/s_server.c b/apps/s_server.c
index 364f76b..8565a3a 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1407,7 +1407,7 @@ int s_server_main(int argc, char *argv[])
             for (p = psk_key = opt_arg(); *p; p++) {
                 if (isxdigit(_UC(*p)))
                     continue;
-                BIO_printf(bio_err, "Not a hex number '%s'\n", *argv);
+                BIO_printf(bio_err, "Not a hex number '%s'\n", psk_key);
                 goto end;
             }
             break;