diff options
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/.cvsignore | 1 | ||||
| -rw-r--r-- | crypto/bio/bio.err | 23 | ||||
| -rw-r--r-- | crypto/bio/bio.h | 22 | ||||
| -rw-r--r-- | crypto/bio/bio_err.c | 5 |
4 files changed, 19 insertions, 32 deletions
diff --git a/crypto/bio/.cvsignore b/crypto/bio/.cvsignore new file mode 100644 index 0000000000..a65b41774a --- /dev/null +++ b/crypto/bio/.cvsignore @@ -0,0 +1 @@ +lib diff --git a/crypto/bio/bio.err b/crypto/bio/bio.err index daef6430f8..e804f0d524 100644 --- a/crypto/bio/bio.err +++ b/crypto/bio/bio.err @@ -19,9 +19,8 @@ #define BIO_F_CONN_STATE 115 #define BIO_F_FILE_CTRL 116 #define BIO_F_MEM_WRITE 117 -#define BIO_F_SOCKS4A_STATE 118 -#define BIO_F_SSL_NEW 119 -#define BIO_F_WSASTARTUP 120 +#define BIO_F_SSL_NEW 118 +#define BIO_F_WSASTARTUP 119 /* Reason codes. */ #define BIO_R_ACCEPT_ERROR 100 @@ -40,14 +39,10 @@ #define BIO_R_NO_PORT_DEFINED 113 #define BIO_R_NO_PORT_SPECIFIED 114 #define BIO_R_NULL_PARAMETER 115 -#define BIO_R_SOCKS_ID_AND_IDENT_DID_NOT_MATCH 116 -#define BIO_R_SOCKS_REJECTED_CONNECTION 117 -#define BIO_R_SOCKS_UNABLE_TO_TALK_TO_IDENT_SERVER 118 -#define BIO_R_SOCKS_UNKNOWN_ERROR 119 -#define BIO_R_TAG_MISMATCH 120 -#define BIO_R_UNABLE_TO_BIND_SOCKET 121 -#define BIO_R_UNABLE_TO_CREATE_SOCKET 122 -#define BIO_R_UNABLE_TO_LISTEN_SOCKET 123 -#define BIO_R_UNINITALISED 124 -#define BIO_R_UNSUPPORTED_METHOD 125 -#define BIO_R_WSASTARTUP 126 +#define BIO_R_TAG_MISMATCH 116 +#define BIO_R_UNABLE_TO_BIND_SOCKET 117 +#define BIO_R_UNABLE_TO_CREATE_SOCKET 118 +#define BIO_R_UNABLE_TO_LISTEN_SOCKET 119 +#define BIO_R_UNINITALISED 120 +#define BIO_R_UNSUPPORTED_METHOD 121 +#define BIO_R_WSASTARTUP 122 diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index 35db3dffb1..8ddfedee51 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -683,8 +683,8 @@ int BIO_printf(); #define BIO_F_CONN_STATE 115 #define BIO_F_FILE_CTRL 116 #define BIO_F_MEM_WRITE 117 -#define BIO_F_SSL_NEW 119 -#define BIO_F_WSASTARTUP 120 +#define BIO_F_SSL_NEW 118 +#define BIO_F_WSASTARTUP 119 /* Reason codes. */ #define BIO_R_ACCEPT_ERROR 100 @@ -703,17 +703,13 @@ int BIO_printf(); #define BIO_R_NO_PORT_DEFINED 113 #define BIO_R_NO_PORT_SPECIFIED 114 #define BIO_R_NULL_PARAMETER 115 -#define BIO_R_SOCKS_ID_AND_IDENT_DID_NOT_MATCH 116 -#define BIO_R_SOCKS_REJECTED_CONNECTION 117 -#define BIO_R_SOCKS_UNABLE_TO_TALK_TO_IDENT_SERVER 118 -#define BIO_R_SOCKS_UNKNOWN_ERROR 119 -#define BIO_R_TAG_MISMATCH 120 -#define BIO_R_UNABLE_TO_BIND_SOCKET 121 -#define BIO_R_UNABLE_TO_CREATE_SOCKET 122 -#define BIO_R_UNABLE_TO_LISTEN_SOCKET 123 -#define BIO_R_UNINITALISED 124 -#define BIO_R_UNSUPPORTED_METHOD 125 -#define BIO_R_WSASTARTUP 126 +#define BIO_R_TAG_MISMATCH 116 +#define BIO_R_UNABLE_TO_BIND_SOCKET 117 +#define BIO_R_UNABLE_TO_CREATE_SOCKET 118 +#define BIO_R_UNABLE_TO_LISTEN_SOCKET 119 +#define BIO_R_UNINITALISED 120 +#define BIO_R_UNSUPPORTED_METHOD 121 +#define BIO_R_WSASTARTUP 122 #ifdef __cplusplus } diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c index 01aac6e582..58a82867a3 100644 --- a/crypto/bio/bio_err.c +++ b/crypto/bio/bio_err.c @@ -81,7 +81,6 @@ static ERR_STRING_DATA BIO_str_functs[]= {ERR_PACK(0,BIO_F_CONN_STATE,0), "CONN_STATE"}, {ERR_PACK(0,BIO_F_FILE_CTRL,0), "FILE_CTRL"}, {ERR_PACK(0,BIO_F_MEM_WRITE,0), "MEM_WRITE"}, -{ERR_PACK(0,BIO_F_SOCKS4A_STATE,0), "SOCKS4A_STATE"}, {ERR_PACK(0,BIO_F_SSL_NEW,0), "SSL_NEW"}, {ERR_PACK(0,BIO_F_WSASTARTUP,0), "WSASTARTUP"}, {0,NULL}, @@ -105,10 +104,6 @@ static ERR_STRING_DATA BIO_str_reasons[]= {BIO_R_NO_PORT_DEFINED ,"no port defined"}, {BIO_R_NO_PORT_SPECIFIED ,"no port specified"}, {BIO_R_NULL_PARAMETER ,"null parameter"}, -{BIO_R_SOCKS_ID_AND_IDENT_DID_NOT_MATCH ,"socks id and ident did not match"}, -{BIO_R_SOCKS_REJECTED_CONNECTION ,"socks rejected connection"}, -{BIO_R_SOCKS_UNABLE_TO_TALK_TO_IDENT_SERVER,"socks unable to talk to ident server"}, -{BIO_R_SOCKS_UNKNOWN_ERROR ,"socks unknown error"}, {BIO_R_TAG_MISMATCH ,"tag mismatch"}, {BIO_R_UNABLE_TO_BIND_SOCKET ,"unable to bind socket"}, {BIO_R_UNABLE_TO_CREATE_SOCKET ,"unable to create socket"}, |