[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  210ac6824670b4d207f6ea7257d21adb44986ee4 (commit)
      from  124cbe188753d5a73990b416b4ae3fd6cc90b77a (commit)


- Log -----------------------------------------------------------------
commit 210ac6824670b4d207f6ea7257d21adb44986ee4
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 10 19:41:27 2016 +0000

    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 at openssl.org>

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

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

diff --git a/apps/errstr.c b/apps/errstr.c
index 99bb9e9..141338a 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