Commit 52f5926c authored by Richard Levitte's avatar Richard Levitte
Browse files

make update 



Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent 417be660

crypto/bio/bio_err.c

+8 −1
Original line number Diff line number Diff line
@@ -142,12 +142,17 @@ static ERR_STRING_DATA BIO_str_reasons[] = { 
    {ERR_REASON(BIO_R_IN_USE), "in use"},

    {ERR_REASON(BIO_R_KEEPALIVE), "keepalive"},

    {ERR_REASON(BIO_R_LISTEN_V6_ONLY), "listen v6 only"},

    {ERR_REASON(BIO_R_LOOKUP_RETURNED_NOTHING), "lookup returned nothing"},

    {ERR_REASON(BIO_R_MALFORMED_HOST_OR_SERVICE), "malformed host or service"},

    {ERR_REASON(BIO_R_NBIO_CONNECT_ERROR), "nbio connect error"},

    {ERR_REASON(BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED),

     "no accept addr or service specified"},

    {ERR_REASON(BIO_R_NO_ACCEPT_PORT_SPECIFIED), "no accept port specified"},

    {ERR_REASON(BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED),

     "no hostname or service specified"},

    {ERR_REASON(BIO_R_NO_HOSTNAME_SPECIFIED), "no hostname specified"},

    {ERR_REASON(BIO_R_NO_PORT_DEFINED), "no port defined"},

    {ERR_REASON(BIO_R_NO_PORT_SPECIFIED), "no port specified"},

    {ERR_REASON(BIO_R_NO_SERVICE_SPECIFIED), "no service specified"},

    {ERR_REASON(BIO_R_NO_SUCH_FILE), "no such file"},

    {ERR_REASON(BIO_R_NULL_PARAMETER), "null parameter"},

    {ERR_REASON(BIO_R_TAG_MISMATCH), "tag mismatch"},
@@ -157,8 +162,10 @@ static ERR_STRING_DATA BIO_str_reasons[] = { 
    {ERR_REASON(BIO_R_UNABLE_TO_LISTEN_SOCKET), "unable to listen socket"},

    {ERR_REASON(BIO_R_UNABLE_TO_NODELAY), "unable to nodelay"},

    {ERR_REASON(BIO_R_UNABLE_TO_REUSEADDR), "unable to reuseaddr"},

    {ERR_REASON(BIO_R_UNAVAILABLE_IP_FAMILY), "unavailable ip family"},

    {ERR_REASON(BIO_R_UNINITIALIZED), "uninitialized"},

    {ERR_REASON(BIO_R_UNKNOWN_INFO_TYPE), "unknown info type"},

    {ERR_REASON(BIO_R_UNSUPPORTED_IP_FAMILY), "unsupported ip family"},

    {ERR_REASON(BIO_R_UNSUPPORTED_METHOD), "unsupported method"},

    {ERR_REASON(BIO_R_UNSUPPORTED_PROTOCOL_FAMILY),

     "unsupported protocol family"},

include/openssl/bio.h

+5 −0
Original line number Diff line number Diff line
@@ -894,9 +894,12 @@ void ERR_load_BIO_strings(void); 
# define BIO_R_IN_USE                                     123

# define BIO_R_KEEPALIVE                                  109

# define BIO_R_LISTEN_V6_ONLY                             136

# define BIO_R_LOOKUP_RETURNED_NOTHING                    142

# define BIO_R_MALFORMED_HOST_OR_SERVICE                  130

# define BIO_R_NBIO_CONNECT_ERROR                         110

# define BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED        143

# define BIO_R_NO_ACCEPT_PORT_SPECIFIED                   111

# define BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED           144

# define BIO_R_NO_HOSTNAME_SPECIFIED                      112

# define BIO_R_NO_PORT_DEFINED                            113

# define BIO_R_NO_SERVICE_SPECIFIED                       114
@@ -909,8 +912,10 @@ void ERR_load_BIO_strings(void); 
# define BIO_R_UNABLE_TO_LISTEN_SOCKET                    119

# define BIO_R_UNABLE_TO_NODELAY                          138

# define BIO_R_UNABLE_TO_REUSEADDR                        139

# define BIO_R_UNAVAILABLE_IP_FAMILY                      145

# define BIO_R_UNINITIALIZED                              120

# define BIO_R_UNKNOWN_INFO_TYPE                          140

# define BIO_R_UNSUPPORTED_IP_FAMILY                      146

# define BIO_R_UNSUPPORTED_METHOD                         121

# define BIO_R_UNSUPPORTED_PROTOCOL_FAMILY                131

# define BIO_R_WRITE_TO_READ_ONLY_BIO                     126