[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d40cf9bc9c0913310ef2232b13d8e15e73e9d2b4 (commit)
      from  e8461ee1d17d64dddcdedf133c7f47ab4ac15ff2 (commit)


- Log -----------------------------------------------------------------
commit d40cf9bc9c0913310ef2232b13d8e15e73e9d2b4
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 10 05:12:52 2016 +0100

    VMS getnameinfo() seems to have a bug with returned service string
    
    It seems like it gives back gibberish.  If we asked for a numeric
    service, it's easy to check for a digit in the first position, and
    if there isn't any, rewrite it using older methods.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/bio/b_addr.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index b60d6ac..9131dcd 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -58,6 +58,7 @@
 
 #include <openssl/err.h>
 #include <openssl/buffer.h>
+#include <ctype.h>
 
 /*
  * Throughout this file and bio_lcl.h, the existence of the macro
@@ -250,6 +251,16 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
             }
             return 0;
         }
+
+        /* VMS getnameinfo() seems to have a bug, where serv gets filled
+         * with gibberish.  We can at least check for digits when flags
+         * has NI_NUMERICSERV enabled
+         */
+        if ((flags & NI_NUMERICSERV) != 0 && !isdigit(serv[0])) {
+            BIO_snprintf(serv, sizeof(serv), "%d",
+                         ntohs(BIO_ADDR_rawport(ap)));
+        }
+
         if (hostname)
             *hostname = OPENSSL_strdup(host);
         if (service)