[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7d9533bfa2fe5a5bf2bb19ff6c70558f6caeb92d (commit)
      from  4e9954799aaf6a9012603ed35b9168f2001e668d (commit)


- Log -----------------------------------------------------------------
commit 7d9533bfa2fe5a5bf2bb19ff6c70558f6caeb92d
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Dec 16 03:50:40 2016 +0100

    HP-UX doesn't have hstrerror(), so make our own for that platform
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2092)
    (cherry picked from commit 46766d003666da5f90346da7e6d09e109355f5c6)

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

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

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index 29f92cf..0f1900d 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -18,6 +18,30 @@
 #include <internal/thread_once.h>
 #include <ctype.h>
 
+#ifdef _HPUX_SOURCE
+static const char *ossl_hstrerror(int herr)
+{
+    switch (herr) {
+    case -1:
+        return strerror(errno);
+    case 0:
+        return "No error";
+    case HOST_NOT_FOUND:
+        return "Host not found";
+    case NO_DATA:                /* NO_ADDRESS is a synonym */
+        return "No data";
+    case NO_RECOVERY:
+        return "Non recoverable error";
+    case TRY_AGAIN:
+        return "Try again";
+    default:
+        break;
+    }
+    return "unknown error";
+}
+# define hstrerror(e) ossl_hstrerror(e)
+#endif
+
 CRYPTO_RWLOCK *bio_lookup_lock;
 static CRYPTO_ONCE bio_lookup_init = CRYPTO_ONCE_STATIC_INIT;