Commit 1b827d7b authored by Bodo Möller's avatar Bodo Möller
Browse files

Clean up error codes a bit. 

(engines/ccgost/ remains utter chaos, though; "make errors" is not happy.)
parent a005fb01

engines/ccgost/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ tags: 
	ctags $(SRC)



errors:

	$(PERL) ../../util/mkerr.pl -conf gost.ec -nostatic -debug -write $(SRC)

	$(PERL) ../../util/mkerr.pl -conf gost.ec -nostatic -write $(SRC)



lib: $(LIBOBJ)

	if [ -n "$(SHARED_LIBS)" ]; then \

engines/ccgost/e_gost_err.h

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ void ERR_GOST_error(int function, int reason, char *file, int line); 
#define GOST_F_DECODE_GOST_ALGOR_PARAMS			 131

#define GOST_F_DECRYPT_CRYPTOCOM_KEY			 120

#define GOST_F_ENCODE_GOST_ALGOR_PARAMS			 130

#define GOST_F_FILL_GOST2001_PARAMS			 99

#define GOST_F_FILL_GOST2001_PARAMS			 144

#define GOST_F_FILL_GOST94_PARAMS			 100

#define GOST_F_GET_ENCRYPTION_PARAMS			 101

#define GOST_F_GOST2001_COMPUTE_PUBLIC			 102
@@ -126,7 +126,7 @@ void ERR_GOST_error(int function, int reason, char *file, int line); 
#define GOST_R_ERROR_STORING_IV				 121

#define GOST_R_ERROR_STORING_MAC			 122

#define GOST_R_INCOMPATIBLE_ALGORITHMS			 130

#define GOST_R_INVALID_CIPHER_PARAMS			 99

#define GOST_R_INVALID_CIPHER_PARAMS			 136

#define GOST_R_INVALID_CIPHER_PARAM_OID			 100

#define GOST_R_INVALID_DIGEST_TYPE			 101

#define GOST_R_INVALID_ENCRYPTED_KEY_SIZE		 123

ssl/ssl.h

+7 −8
Original line number Diff line number Diff line
@@ -1765,7 +1765,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL3_GET_SERVER_CERTIFICATE		 144

#define SSL_F_SSL3_GET_SERVER_DONE			 145

#define SSL_F_SSL3_GET_SERVER_HELLO			 146

#define SSL_F_SSL3_NEW_SESSION_TICKET			 284

#define SSL_F_SSL3_HANDSHAKE_MAC			 285

#define SSL_F_SSL3_OUTPUT_CERT_CHAIN			 147

#define SSL_F_SSL3_PEEK					 235

#define SSL_F_SSL3_READ_BYTES				 148
@@ -1861,17 +1861,16 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE		 206

#define SSL_F_SSL_VERIFY_CERT_CHAIN			 207

#define SSL_F_SSL_WRITE					 208

#define SSL_F_TLS1_CERT_VERIFY_MAC			 286

#define SSL_F_TLS1_CHANGE_CIPHER_STATE			 209

#define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT		 274

#define SSL_F_TLS1_ENC					 210

#define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT		 275

#define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT		 276

#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
@@ -1951,7 +1950,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_INVALID_CHALLENGE_LENGTH			 158

#define SSL_R_INVALID_COMMAND				 280

#define SSL_R_INVALID_PURPOSE				 278

#define SSL_R_INVALID_TICKET_KEYS_LENGTH		 324

#define SSL_R_INVALID_TICKET_KEYS_LENGTH		 325

#define SSL_R_INVALID_TRUST				 279

#define SSL_R_KEY_ARG_TOO_LONG				 284

#define SSL_R_KRB5					 285
@@ -2002,6 +2001,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_NO_PRIVATE_KEY_ASSIGNED			 190

#define SSL_R_NO_PROTOCOLS_AVAILABLE			 191

#define SSL_R_NO_PUBLICKEY				 192

#define SSL_R_NO_REQUIRED_DIGEST			 324

#define SSL_R_NO_SHARED_CIPHER				 193

#define SSL_R_NO_VERIFY_CALLBACK			 194

#define SSL_R_NULL_SSL_CTX				 195
@@ -2113,6 +2113,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_UNKNOWN_STATE				 255

#define SSL_R_UNSUPPORTED_CIPHER			 256

#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM		 257

#define SSL_R_UNSUPPORTED_DIGEST_TYPE			 326

#define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE		 315

#define SSL_R_UNSUPPORTED_PROTOCOL			 258

#define SSL_R_UNSUPPORTED_SSL_VERSION			 259
@@ -2126,8 +2127,6 @@ 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_UNSUPPORTED_DIGEST_TYPE 	270

#define SSL_R_NO_REQUIRED_DIGEST 324



#ifdef  __cplusplus

}

ssl/ssl_err.c

+5 −7
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_SSL3_GET_SERVER_CERTIFICATE),	"SSL3_GET_SERVER_CERTIFICATE"},

{ERR_FUNC(SSL_F_SSL3_GET_SERVER_DONE),	"SSL3_GET_SERVER_DONE"},

{ERR_FUNC(SSL_F_SSL3_GET_SERVER_HELLO),	"SSL3_GET_SERVER_HELLO"},

{ERR_FUNC(SSL_F_SSL3_NEW_SESSION_TICKET),	"SSL3_NEW_SESSION_TICKET"},

{ERR_FUNC(SSL_F_SSL3_HANDSHAKE_MAC),	"ssl3_handshake_mac"},

{ERR_FUNC(SSL_F_SSL3_OUTPUT_CERT_CHAIN),	"SSL3_OUTPUT_CERT_CHAIN"},

{ERR_FUNC(SSL_F_SSL3_PEEK),	"SSL3_PEEK"},

{ERR_FUNC(SSL_F_SSL3_READ_BYTES),	"SSL3_READ_BYTES"},
@@ -248,17 +248,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_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_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}

	};
@@ -393,6 +391,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_NO_PRIVATE_KEY_ASSIGNED),"no private key assigned"},

{ERR_REASON(SSL_R_NO_PROTOCOLS_AVAILABLE),"no protocols available"},

{ERR_REASON(SSL_R_NO_PUBLICKEY)          ,"no publickey"},

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

{ERR_REASON(SSL_R_NO_SHARED_CIPHER)      ,"no shared cipher"},

{ERR_REASON(SSL_R_NO_VERIFY_CALLBACK)    ,"no verify callback"},

{ERR_REASON(SSL_R_NULL_SSL_CTX)          ,"null ssl ctx"},
@@ -504,6 +503,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_UNKNOWN_STATE)         ,"unknown state"},

{ERR_REASON(SSL_R_UNSUPPORTED_CIPHER)    ,"unsupported cipher"},

{ERR_REASON(SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM),"unsupported compression algorithm"},

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

{ERR_REASON(SSL_R_UNSUPPORTED_ELLIPTIC_CURVE),"unsupported elliptic curve"},

{ERR_REASON(SSL_R_UNSUPPORTED_PROTOCOL)  ,"unsupported protocol"},

{ERR_REASON(SSL_R_UNSUPPORTED_SSL_VERSION),"unsupported ssl version"},
@@ -517,8 +517,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"},

{0,NULL}

	};