Commit 8e1d3ba5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix duplicate error codes.

parent 37210fe7

ssl/ssl.h

+4 −7
Original line number Diff line number Diff line
@@ -1801,7 +1801,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL3_ENC					 134

#define SSL_F_SSL3_GENERATE_KEY_BLOCK			 238

#define SSL_F_SSL3_GET_CERTIFICATE_REQUEST		 135

#define SSL_F_SSL3_GET_CERT_STATUS			 288

#define SSL_F_SSL3_GET_CERT_STATUS			 289

#define SSL_F_SSL3_GET_CERT_VERIFY			 136

#define SSL_F_SSL3_GET_CLIENT_CERTIFICATE		 137

#define SSL_F_SSL3_GET_CLIENT_HELLO			 138
@@ -1920,10 +1920,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_TLS1_PRF					 284

#define SSL_F_TLS1_SETUP_KEY_BLOCK			 211

#define SSL_F_WRITE_PENDING				 212

#define SSL_F_TLS1_FINAL_FINISH_MAC		283

#define SSL_F_TLS1_PRF				284

#define SSL_F_SSL3_HANDSHAKE_MAC    285

#define SSL_F_TLS1_CERT_VERIFY_MAC  286



/* Reason codes. */

#define SSL_R_APP_DATA_IN_HANDSHAKE			 100

#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
@@ -2050,6 +2047,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_NO_CIPHER_MATCH				 185

#define SSL_R_NO_CLIENT_CERT_RECEIVED			 186

#define SSL_R_NO_COMPRESSION_SPECIFIED			 187

#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER		 330

#define SSL_R_NO_METHOD_SPECIFIED			 188

#define SSL_R_NO_PRIVATEKEY				 189

#define SSL_R_NO_PRIVATE_KEY_ASSIGNED			 190
@@ -2183,8 +2181,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_WRONG_VERSION_NUMBER			 267

#define SSL_R_X509_LIB					 268

#define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS		 269

#define SSL_R_NO_REQUIRED_DIGEST 324

#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER 330



#ifdef  __cplusplus

}

#endif

ssl/ssl_err.c

+3 −9
Original line number Diff line number Diff line
@@ -251,19 +251,15 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE),	"SSL_use_RSAPrivateKey_file"},

{ERR_FUNC(SSL_F_SSL_VERIFY_CERT_CHAIN),	"SSL_VERIFY_CERT_CHAIN"},

{ERR_FUNC(SSL_F_SSL_WRITE),	"SSL_write"},

{ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC),	"TLS1_CERT_VERIFY_MAC"},

{ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC),	"tls1_cert_verify_mac"},

{ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE),	"TLS1_CHANGE_CIPHER_STATE"},

{ERR_FUNC(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT),	"TLS1_CHECK_SERVERHELLO_TLSEXT"},

{ERR_FUNC(SSL_F_TLS1_ENC),	"TLS1_ENC"},

{ERR_FUNC(SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT),	"TLS1_PREPARE_CLIENTHELLO_TLSEXT"},

{ERR_FUNC(SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT),	"TLS1_PREPARE_SERVERHELLO_TLSEXT"},

{ERR_FUNC(SSL_F_TLS1_PRF),	"TLS1_PRF"},

{ERR_FUNC(SSL_F_TLS1_PRF),	"tls1_prf"},

{ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK),	"TLS1_SETUP_KEY_BLOCK"},

{ERR_FUNC(SSL_F_WRITE_PENDING),	"WRITE_PENDING"},

{ERR_FUNC(SSL_F_TLS1_FINAL_FINISH_MAC),"tls1_final_finish_mac"},

{ERR_FUNC(SSL_F_TLS1_PRF),"tls1_prf"},

{ERR_FUNC(SSL_F_SSL3_HANDSHAKE_MAC),"ssl3_handshake_mac"},

{ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC),"tls1_cert_verify_mac"},

{0,NULL}

	};
@@ -394,6 +390,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_NO_CIPHER_MATCH)       ,"no cipher match"},

{ERR_REASON(SSL_R_NO_CLIENT_CERT_RECEIVED),"no client cert received"},

{ERR_REASON(SSL_R_NO_COMPRESSION_SPECIFIED),"no compression specified"},

{ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),"Peer haven't sent GOST certificate, required for selected ciphersuite"},

{ERR_REASON(SSL_R_NO_METHOD_SPECIFIED)   ,"no method specified"},

{ERR_REASON(SSL_R_NO_PRIVATEKEY)         ,"no privatekey"},

{ERR_REASON(SSL_R_NO_PRIVATE_KEY_ASSIGNED),"no private key assigned"},
@@ -527,9 +524,6 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_WRONG_VERSION_NUMBER)  ,"wrong version number"},

{ERR_REASON(SSL_R_X509_LIB)              ,"x509 lib"},

{ERR_REASON(SSL_R_X509_VERIFICATION_SETUP_PROBLEMS),"x509 verification setup problems"},

{ERR_REASON(SSL_R_UNSUPPORTED_DIGEST_TYPE),"unsupported digest type"},

{ERR_REASON(SSL_R_NO_REQUIRED_DIGEST),"digest requred for handshake isn't computed"},

{ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),"Peer haven't sent GOST certificate, required for selected ciphersuite"},

{0,NULL}

	};