From d40cf9bc9c0913310ef2232b13d8e15e73e9d2b4 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 10 Feb 2016 05:12:52 +0100 Subject: [PATCH] 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 --- 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 b60d6acfa4..9131dcdd16 100644 --- a/crypto/bio/b_addr.c +++ b/crypto/bio/b_addr.c @@ -58,6 +58,7 @@ #include #include +#include /* * 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) -- 2.25.1