Various cleanups and fixed by Marc and Ralf to start the OpenTLS project

1 files changed, 9 insertions, 13 deletions

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
 }