Commit 52df25cf authored by Rich Salz's avatar Rich Salz
Browse files

make error tables const and separate header file 



Run perltidy on util/mkerr
Change some mkerr flags, write some doc comments
Make generated tables "const" when genearting lib-internal ones.
Add "state" file for mkerr
Renerate error tables and headers
Rationalize declaration of ERR_load_XXX_strings
Fix out-of-tree build
Add -static; sort flags/vars for options.
Also tweak code output
Moved engines/afalg to engines (from master)
Use -static flag
Standard engine #include's of errors
Don't linewrap err string tables unless necessary

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3392)
parent be606c01

.gitignore

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,13 @@ Makefile 
/openssl/include/opensslconf.h

/util/domd



# error code files

/crypto/err/openssl.txt.old

/engines/e_afalg.txt.old

/engines/e_capi.txt.old

/engines/e_dasync.txt.old

/engines/e_ossltest.txt.old



# Executables

/apps/openssl

/test/sha256t

Configurations/unix-Makefile.tmpl

+7 −5
Original line number Diff line number Diff line
@@ -650,13 +650,15 @@ generate_crypto_asn1: 
	( cd $(SRCDIR); $(PERL) crypto/asn1/charmap.pl \

			        > crypto/asn1/charmap.h )



# Set to -force to force a rebuild

ERROR_REBUILD=

errors:

	( cd $(SRCDIR); $(PERL) util/ck_errf.pl -strict */*.c */*/*.c )

	( cd $(SRCDIR); $(PERL) util/mkerr.pl -recurse -write )

	( cd $(SRCDIR); $(PERL) util/mkerr.pl $(ERROR_REBUILD) -internal )

	( cd $(SRCDIR)/engines; \

	  for e in *.ec; do \

	      $(PERL) ../util/mkerr.pl -conf $$e \

		      -nostatic -staticloader -write *.c; \

          for E in *.ec ; do \

              $(PERL) ../util/mkerr.pl $(ERROR_REBUILD) -static \

                -conf $$E `basename $$E .ec`.c ; \

          done )



ordinals:

crypto/asn1/asn1_err.c

+300 −239

File changed.

Preview size limit exceeded, changes collapsed.

crypto/async/async_err.c

+20 −22
Original line number Diff line number Diff line 
/*

 * Generated by util/mkerr.pl DO NOT EDIT

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -8,31 +8,30 @@ 
 * https://www.openssl.org/source/license.html

 */



#include <stdio.h>

#include <openssl/err.h>

#include <openssl/async.h>

#include <openssl/asyncerr.h>



/* BEGIN ERROR CODES */

#ifndef OPENSSL_NO_ERR



# define ERR_FUNC(func) ERR_PACK(ERR_LIB_ASYNC,func,0)

# define ERR_REASON(reason) ERR_PACK(ERR_LIB_ASYNC,0,reason)



static ERR_STRING_DATA ASYNC_str_functs[] = {

    {ERR_FUNC(ASYNC_F_ASYNC_CTX_NEW), "async_ctx_new"},

    {ERR_FUNC(ASYNC_F_ASYNC_INIT_THREAD), "ASYNC_init_thread"},

    {ERR_FUNC(ASYNC_F_ASYNC_JOB_NEW), "async_job_new"},

    {ERR_FUNC(ASYNC_F_ASYNC_PAUSE_JOB), "ASYNC_pause_job"},

    {ERR_FUNC(ASYNC_F_ASYNC_START_FUNC), "async_start_func"},

    {ERR_FUNC(ASYNC_F_ASYNC_START_JOB), "ASYNC_start_job"},

static const ERR_STRING_DATA ASYNC_str_functs[] = {

    {ERR_PACK(ERR_LIB_ASYNC, ASYNC_F_ASYNC_CTX_NEW, 0), "async_ctx_new"},

    {ERR_PACK(ERR_LIB_ASYNC, ASYNC_F_ASYNC_INIT_THREAD, 0),

     "ASYNC_init_thread"},

    {ERR_PACK(ERR_LIB_ASYNC, ASYNC_F_ASYNC_JOB_NEW, 0), "async_job_new"},

    {ERR_PACK(ERR_LIB_ASYNC, ASYNC_F_ASYNC_PAUSE_JOB, 0), "ASYNC_pause_job"},

    {ERR_PACK(ERR_LIB_ASYNC, ASYNC_F_ASYNC_START_FUNC, 0), "async_start_func"},

    {ERR_PACK(ERR_LIB_ASYNC, ASYNC_F_ASYNC_START_JOB, 0), "ASYNC_start_job"},

    {0, NULL}

};



static ERR_STRING_DATA ASYNC_str_reasons[] = {

    {ERR_REASON(ASYNC_R_FAILED_TO_SET_POOL), "failed to set pool"},

    {ERR_REASON(ASYNC_R_FAILED_TO_SWAP_CONTEXT), "failed to swap context"},

    {ERR_REASON(ASYNC_R_INIT_FAILED), "init failed"},

    {ERR_REASON(ASYNC_R_INVALID_POOL_SIZE), "invalid pool size"},

static const ERR_STRING_DATA ASYNC_str_reasons[] = {

    {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SET_POOL),

    "failed to set pool"},

    {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SWAP_CONTEXT),

    "failed to swap context"},

    {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INIT_FAILED), "init failed"},

    {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INVALID_POOL_SIZE),

    "invalid pool size"},

    {0, NULL}

};
@@ -41,10 +40,9 @@ static ERR_STRING_DATA ASYNC_str_reasons[] = { 
int ERR_load_ASYNC_strings(void)

{

#ifndef OPENSSL_NO_ERR



    if (ERR_func_error_string(ASYNC_str_functs[0].error) == NULL) {

        ERR_load_strings(0, ASYNC_str_functs);

        ERR_load_strings(0, ASYNC_str_reasons);

        ERR_load_strings_const(ASYNC_str_functs);

        ERR_load_strings_const(ASYNC_str_reasons);

    }

#endif

    return 1;

crypto/bio/bio_err.c

+105 −102
Original line number Diff line number Diff line
@@ -8,112 +8,116 @@ 
 * https://www.openssl.org/source/license.html

 */



#include <stdio.h>

#include <openssl/err.h>

#include <openssl/bio.h>

#include <openssl/bioerr.h>



/* BEGIN ERROR CODES */

#ifndef OPENSSL_NO_ERR



# define ERR_FUNC(func) ERR_PACK(ERR_LIB_BIO,func,0)

# define ERR_REASON(reason) ERR_PACK(ERR_LIB_BIO,0,reason)



static ERR_STRING_DATA BIO_str_functs[] = {

    {ERR_FUNC(BIO_F_ACPT_STATE), "acpt_state"},

    {ERR_FUNC(BIO_F_ADDR_STRINGS), "addr_strings"},

    {ERR_FUNC(BIO_F_BIO_ACCEPT), "BIO_accept"},

    {ERR_FUNC(BIO_F_BIO_ACCEPT_EX), "BIO_accept_ex"},

    {ERR_FUNC(BIO_F_BIO_ADDR_NEW), "BIO_ADDR_new"},

    {ERR_FUNC(BIO_F_BIO_CALLBACK_CTRL), "BIO_callback_ctrl"},

    {ERR_FUNC(BIO_F_BIO_CONNECT), "BIO_connect"},

    {ERR_FUNC(BIO_F_BIO_CTRL), "BIO_ctrl"},

    {ERR_FUNC(BIO_F_BIO_GETS), "BIO_gets"},

    {ERR_FUNC(BIO_F_BIO_GET_HOST_IP), "BIO_get_host_ip"},

    {ERR_FUNC(BIO_F_BIO_GET_NEW_INDEX), "BIO_get_new_index"},

    {ERR_FUNC(BIO_F_BIO_GET_PORT), "BIO_get_port"},

    {ERR_FUNC(BIO_F_BIO_LISTEN), "BIO_listen"},

    {ERR_FUNC(BIO_F_BIO_LOOKUP), "BIO_lookup"},

    {ERR_FUNC(BIO_F_BIO_LOOKUP_EX), "BIO_lookup_ex"},

    {ERR_FUNC(BIO_F_BIO_MAKE_PAIR), "bio_make_pair"},

    {ERR_FUNC(BIO_F_BIO_NEW), "BIO_new"},

    {ERR_FUNC(BIO_F_BIO_NEW_DGRAM_SCTP), "BIO_new_dgram_sctp"},

    {ERR_FUNC(BIO_F_BIO_NEW_FILE), "BIO_new_file"},

    {ERR_FUNC(BIO_F_BIO_NEW_MEM_BUF), "BIO_new_mem_buf"},

    {ERR_FUNC(BIO_F_BIO_NREAD), "BIO_nread"},

    {ERR_FUNC(BIO_F_BIO_NREAD0), "BIO_nread0"},

    {ERR_FUNC(BIO_F_BIO_NWRITE), "BIO_nwrite"},

    {ERR_FUNC(BIO_F_BIO_NWRITE0), "BIO_nwrite0"},

    {ERR_FUNC(BIO_F_BIO_PARSE_HOSTSERV), "BIO_parse_hostserv"},

    {ERR_FUNC(BIO_F_BIO_PUTS), "BIO_puts"},

    {ERR_FUNC(BIO_F_BIO_READ), "BIO_read"},

    {ERR_FUNC(BIO_F_BIO_READ_EX), "BIO_read_ex"},

    {ERR_FUNC(BIO_F_BIO_READ_INTERN), "bio_read_intern"},

    {ERR_FUNC(BIO_F_BIO_SOCKET), "BIO_socket"},

    {ERR_FUNC(BIO_F_BIO_SOCKET_NBIO), "BIO_socket_nbio"},

    {ERR_FUNC(BIO_F_BIO_SOCK_INFO), "BIO_sock_info"},

    {ERR_FUNC(BIO_F_BIO_SOCK_INIT), "BIO_sock_init"},

    {ERR_FUNC(BIO_F_BIO_WRITE), "BIO_write"},

    {ERR_FUNC(BIO_F_BIO_WRITE_EX), "BIO_write_ex"},

    {ERR_FUNC(BIO_F_BIO_WRITE_INTERN), "bio_write_intern"},

    {ERR_FUNC(BIO_F_BUFFER_CTRL), "buffer_ctrl"},

    {ERR_FUNC(BIO_F_CONN_CTRL), "conn_ctrl"},

    {ERR_FUNC(BIO_F_CONN_STATE), "conn_state"},

    {ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "dgram_sctp_read"},

    {ERR_FUNC(BIO_F_DGRAM_SCTP_WRITE), "dgram_sctp_write"},

    {ERR_FUNC(BIO_F_FILE_CTRL), "file_ctrl"},

    {ERR_FUNC(BIO_F_FILE_READ), "file_read"},

    {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "linebuffer_ctrl"},

    {ERR_FUNC(BIO_F_MEM_WRITE), "mem_write"},

    {ERR_FUNC(BIO_F_SSL_NEW), "SSL_new"},

static const ERR_STRING_DATA BIO_str_functs[] = {

    {ERR_PACK(ERR_LIB_BIO, BIO_F_ACPT_STATE, 0), "acpt_state"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_ADDR_STRINGS, 0), "addr_strings"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_ACCEPT, 0), "BIO_accept"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_ACCEPT_EX, 0), "BIO_accept_ex"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_ADDR_NEW, 0), "BIO_ADDR_new"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_CALLBACK_CTRL, 0), "BIO_callback_ctrl"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_CONNECT, 0), "BIO_connect"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_CTRL, 0), "BIO_ctrl"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_GETS, 0), "BIO_gets"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_GET_HOST_IP, 0), "BIO_get_host_ip"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_GET_NEW_INDEX, 0), "BIO_get_new_index"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_GET_PORT, 0), "BIO_get_port"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_LISTEN, 0), "BIO_listen"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_LOOKUP, 0), "BIO_lookup"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_LOOKUP_EX, 0), "BIO_lookup_ex"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_MAKE_PAIR, 0), "bio_make_pair"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NEW, 0), "BIO_new"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NEW_DGRAM_SCTP, 0), "BIO_new_dgram_sctp"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NEW_FILE, 0), "BIO_new_file"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NEW_MEM_BUF, 0), "BIO_new_mem_buf"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NREAD, 0), "BIO_nread"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NREAD0, 0), "BIO_nread0"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NWRITE, 0), "BIO_nwrite"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NWRITE0, 0), "BIO_nwrite0"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_PARSE_HOSTSERV, 0), "BIO_parse_hostserv"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_PUTS, 0), "BIO_puts"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_READ, 0), "BIO_read"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_READ_EX, 0), "BIO_read_ex"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_READ_INTERN, 0), "bio_read_intern"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_SOCKET, 0), "BIO_socket"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_SOCKET_NBIO, 0), "BIO_socket_nbio"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_SOCK_INFO, 0), "BIO_sock_info"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_SOCK_INIT, 0), "BIO_sock_init"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_WRITE, 0), "BIO_write"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_WRITE_EX, 0), "BIO_write_ex"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_WRITE_INTERN, 0), "bio_write_intern"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BUFFER_CTRL, 0), "buffer_ctrl"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_CONN_CTRL, 0), "conn_ctrl"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_CONN_STATE, 0), "conn_state"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_DGRAM_SCTP_READ, 0), "dgram_sctp_read"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_DGRAM_SCTP_WRITE, 0), "dgram_sctp_write"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_FILE_CTRL, 0), "file_ctrl"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_FILE_READ, 0), "file_read"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_LINEBUFFER_CTRL, 0), "linebuffer_ctrl"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_MEM_WRITE, 0), "mem_write"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_SSL_NEW, 0), "SSL_new"},

    {0, NULL}

};



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),

static const ERR_STRING_DATA BIO_str_reasons[] = {

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ACCEPT_ERROR), "accept error"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET),

    "addrinfo addr is not af inet"},

    {ERR_REASON(BIO_R_AMBIGUOUS_HOST_OR_SERVICE),

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_AMBIGUOUS_HOST_OR_SERVICE),

    "ambiguous host or service"},

    {ERR_REASON(BIO_R_BAD_FOPEN_MODE), "bad fopen mode"},

    {ERR_REASON(BIO_R_BROKEN_PIPE), "broken pipe"},

    {ERR_REASON(BIO_R_CONNECT_ERROR), "connect error"},

    {ERR_REASON(BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET),

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BAD_FOPEN_MODE), "bad fopen mode"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BROKEN_PIPE), "broken pipe"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_ERROR), "connect error"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET),

    "gethostbyname addr is not af inet"},

    {ERR_REASON(BIO_R_GETSOCKNAME_ERROR), "getsockname error"},

    {ERR_REASON(BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS),

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_ERROR), "getsockname error"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS),

    "getsockname truncated address"},

    {ERR_REASON(BIO_R_GETTING_SOCKTYPE), "getting socktype"},

    {ERR_REASON(BIO_R_INVALID_ARGUMENT), "invalid argument"},

    {ERR_REASON(BIO_R_INVALID_SOCKET), "invalid socket"},

    {ERR_REASON(BIO_R_IN_USE), "in use"},

    {ERR_REASON(BIO_R_LENGTH_TOO_LONG), "length too long"},

    {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),

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETTING_SOCKTYPE), "getting socktype"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_ARGUMENT), "invalid argument"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_SOCKET), "invalid socket"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_IN_USE), "in use"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LENGTH_TOO_LONG), "length too long"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LISTEN_V6_ONLY), "listen v6 only"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOOKUP_RETURNED_NOTHING),

    "lookup returned nothing"},

    {ERR_PACK(ERR_LIB_BIO, 0, 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),

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NBIO_CONNECT_ERROR), "nbio connect error"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED),

    "no accept addr or service specified"},

    {ERR_REASON(BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED),

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED),

    "no hostname or service specified"},

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

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

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

    {ERR_REASON(BIO_R_UNABLE_TO_BIND_SOCKET), "unable to bind socket"},

    {ERR_REASON(BIO_R_UNABLE_TO_CREATE_SOCKET), "unable to create socket"},

    {ERR_REASON(BIO_R_UNABLE_TO_KEEPALIVE), "unable to keepalive"},

    {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),

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_PORT_DEFINED), "no port defined"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_SUCH_FILE), "no such file"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NULL_PARAMETER), "null parameter"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_BIND_SOCKET),

    "unable to bind socket"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_CREATE_SOCKET),

    "unable to create socket"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_KEEPALIVE),

    "unable to keepalive"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_LISTEN_SOCKET),

    "unable to listen socket"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_NODELAY), "unable to nodelay"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_REUSEADDR),

    "unable to reuseaddr"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNAVAILABLE_IP_FAMILY),

    "unavailable ip family"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNINITIALIZED), "uninitialized"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNKNOWN_INFO_TYPE), "unknown info type"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_IP_FAMILY),

    "unsupported ip family"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_METHOD), "unsupported method"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_PROTOCOL_FAMILY),

    "unsupported protocol family"},

    {ERR_REASON(BIO_R_WRITE_TO_READ_ONLY_BIO), "write to read only BIO"},

    {ERR_REASON(BIO_R_WSASTARTUP), "WSAStartup"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WRITE_TO_READ_ONLY_BIO),

    "write to read only BIO"},

    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WSASTARTUP), "WSAStartup"},

    {0, NULL}

};
@@ -122,10 +126,9 @@ static ERR_STRING_DATA BIO_str_reasons[] = { 
int ERR_load_BIO_strings(void)

{

#ifndef OPENSSL_NO_ERR



    if (ERR_func_error_string(BIO_str_functs[0].error) == NULL) {

        ERR_load_strings(0, BIO_str_functs);

        ERR_load_strings(0, BIO_str_reasons);

        ERR_load_strings_const(BIO_str_functs);

        ERR_load_strings_const(BIO_str_reasons);

    }

#endif

    return 1;