From: Matt Caswell <matt@openssl.org>
Date: Wed, 10 Feb 2016 19:41:27 +0000 (+0000)
Subject: Fix errstr error code parsing
X-Git-Tag: OpenSSL_1_1_0-pre3~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=210ac6824670b4d207f6ea7257d21adb44986ee4;p=thirdparty%2Fopenssl.git

Fix errstr error code parsing

Error codes are printed in hex, and previous OpenSSL versions expected
the error codes to be provided to errstr in hex. In 1.1.0, for some
reason, it was expecting them to be decimal.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/apps/errstr.c b/apps/errstr.c
index 99bb9e9068f..141338adac4 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -111,7 +111,7 @@ int errstr_main(int argc, char **argv)
 
     ret = 0;
     for (argv = opt_rest(); *argv; argv++) {
-        if (!opt_ulong(*argv, &l))
+        if (sscanf(*argv, "%lx", &l) == 0)
             ret++;
         else {
             /* We're not really an SSL application so this won't auto-init, but