From: weinholtendian <45032224+weinholtendian@users.noreply.github.com>
Date: Thu, 31 Jan 2019 07:16:20 +0000 (+0800)
Subject: Fix error message for s_server -psk option
X-Git-Tag: openssl-3.0.0-alpha1~2598
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e57120128fa4e2afa4bda5022a77f73a1e3a0b27;p=oweals%2Fopenssl.git

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@baishancloud.com>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/8113)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 364f76b3f0..8565a3aab3 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;