From: Richard Levitte <levitte@openssl.org>
Date: Tue, 2 Feb 2016 21:43:01 +0000 (+0100)
Subject: make update
X-Git-Tag: OpenSSL_1_1_0-pre3~306
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4f1374e60566c0a6ca6b82e4c0f90f461215b8d6;p=oweals%2Fopenssl.git

make update

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
---

diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index 0942c281b2..bf72ec692b 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -117,6 +117,8 @@ static ERR_STRING_DATA BIO_str_functs[] = {
 
 static ERR_STRING_DATA BIO_str_reasons[] = {
     {ERR_REASON(BIO_R_ACCEPT_ERROR), "accept error"},
+    {ERR_REASON(BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET),
+     "addrinfo addr is not af inet"},
     {ERR_REASON(BIO_R_AMBIGUOUS_HOST_OR_SERVICE), "ambiguous host or service"},
     {ERR_REASON(BIO_R_BAD_FOPEN_MODE), "bad fopen mode"},
     {ERR_REASON(BIO_R_BAD_HOSTNAME_LOOKUP), "bad hostname lookup"},
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 62f9369909..24e5f9fbcb 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -870,6 +870,7 @@ void ERR_load_BIO_strings(void);
 
 /* Reason codes. */
 # define BIO_R_ACCEPT_ERROR                               100
+# define BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET               141
 # define BIO_R_AMBIGUOUS_HOST_OR_SERVICE                  129
 # define BIO_R_BAD_FOPEN_MODE                             101
 # define BIO_R_BAD_HOSTNAME_LOOKUP                        102