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

make errors 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 913592d2

include/openssl/ssl.h

+10 −1
Original line number Diff line number Diff line
@@ -1960,6 +1960,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_SSL3_DIGEST_CACHED_RECORDS                 293

# define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC                 292

# define SSL_F_SSL3_ENC                                   134

# define SSL_F_SSL3_FINAL_FINISH_MAC                      285

# define SSL_F_SSL3_GENERATE_KEY_BLOCK                    238

# define SSL_F_SSL3_GENERATE_MASTER_SECRET                388

# define SSL_F_SSL3_GET_CERTIFICATE_REQUEST               135
@@ -1978,7 +1979,6 @@ 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_FINAL_FINISH_MAC                      285

# define SSL_F_SSL3_NEW_SESSION_TICKET                    287

# define SSL_F_SSL3_OUTPUT_CERT_CHAIN                     147

# define SSL_F_SSL3_PEEK                                  235
@@ -2049,6 +2049,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE             179

# define SSL_F_SSL_CTX_USE_SERVERINFO                     336

# define SSL_F_SSL_CTX_USE_SERVERINFO_FILE                337

# define SSL_F_SSL_DO_CONFIG                              391

# define SSL_F_SSL_DO_HANDSHAKE                           180

# define SSL_F_SSL_GET_NEW_SESSION                        181

# define SSL_F_SSL_GET_PREV_SESSION                       217
@@ -2058,6 +2059,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_SSL_GET_SIGN_PKEY                          183

# define SSL_F_SSL_INIT_WBIO_BUFFER                       184

# define SSL_F_SSL_LOAD_CLIENT_CA_FILE                    185

# define SSL_F_SSL_MODULE_INIT                            392

# define SSL_F_SSL_NEW                                    186

# define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT      300

# define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT               302
@@ -2256,6 +2258,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_R_INCONSISTENT_EXTMS                         104

# define SSL_R_INVALID_COMMAND                            280

# define SSL_R_INVALID_COMPRESSION_ALGORITHM              341

# define SSL_R_INVALID_CONFIGURATION_NAME                 113

# define SSL_R_INVALID_NULL_CMD_NAME                      385

# define SSL_R_INVALID_PURPOSE                            278

# define SSL_R_INVALID_SEQUENCE_NUMBER                    402
@@ -2360,10 +2363,14 @@ void ERR_load_SSL_strings(void); 
# define SSL_R_SSLV3_ALERT_NO_CERTIFICATE                 1041

# define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE             1010

# define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE        1043

# define SSL_R_SSL_COMMAND_SECTION_EMPTY                  117

# define SSL_R_SSL_COMMAND_SECTION_NOT_FOUND              125

# define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION         228

# define SSL_R_SSL_HANDSHAKE_FAILURE                      229

# define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS                 230

# define SSL_R_SSL_NEGATIVE_LENGTH                        372

# define SSL_R_SSL_SECTION_EMPTY                          126

# define SSL_R_SSL_SECTION_NOT_FOUND                      136

# define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED             301

# define SSL_R_SSL_SESSION_ID_CONFLICT                    302

# define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG            273
@@ -2372,6 +2379,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_R_TLSV1_ALERT_DECODE_ERROR                   1050

# define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED              1021

# define SSL_R_TLSV1_ALERT_DECRYPT_ERROR                  1051

# define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION             1060

# define SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK         1086

# define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY          1071

# define SSL_R_TLSV1_ALERT_INTERNAL_ERROR                 1080
@@ -2408,6 +2416,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_R_UNKNOWN_CIPHER_RETURNED                    248

# define SSL_R_UNKNOWN_CIPHER_TYPE                        249

# define SSL_R_UNKNOWN_CMD_NAME                           386

# define SSL_R_UNKNOWN_COMMAND                            139

# define SSL_R_UNKNOWN_DIGEST                             368

# define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE                  250

# define SSL_R_UNKNOWN_PKEY_TYPE                          251

ssl/ssl_err.c

+16 −2
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC),

     "ssl3_do_change_cipher_spec"},

    {ERR_FUNC(SSL_F_SSL3_ENC), "ssl3_enc"},

    {ERR_FUNC(SSL_F_SSL3_FINAL_FINISH_MAC), "ssl3_final_finish_mac"},

    {ERR_FUNC(SSL_F_SSL3_GENERATE_KEY_BLOCK), "ssl3_generate_key_block"},

    {ERR_FUNC(SSL_F_SSL3_GENERATE_MASTER_SECRET),

     "ssl3_generate_master_secret"},
@@ -164,7 +165,6 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
     "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_FINAL_FINISH_MAC), "ssl3_final_finish_mac"},

    {ERR_FUNC(SSL_F_SSL3_NEW_SESSION_TICKET), "SSL3_NEW_SESSION_TICKET"},

    {ERR_FUNC(SSL_F_SSL3_OUTPUT_CERT_CHAIN), "ssl3_output_cert_chain"},

    {ERR_FUNC(SSL_F_SSL3_PEEK), "ssl3_peek"},
@@ -262,6 +262,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL_CTX_USE_SERVERINFO), "SSL_CTX_use_serverinfo"},

    {ERR_FUNC(SSL_F_SSL_CTX_USE_SERVERINFO_FILE),

     "SSL_CTX_use_serverinfo_file"},

    {ERR_FUNC(SSL_F_SSL_DO_CONFIG), "ssl_do_config"},

    {ERR_FUNC(SSL_F_SSL_DO_HANDSHAKE), "SSL_do_handshake"},

    {ERR_FUNC(SSL_F_SSL_GET_NEW_SESSION), "ssl_get_new_session"},

    {ERR_FUNC(SSL_F_SSL_GET_PREV_SESSION), "ssl_get_prev_session"},
@@ -271,6 +272,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL_GET_SIGN_PKEY), "ssl_get_sign_pkey"},

    {ERR_FUNC(SSL_F_SSL_INIT_WBIO_BUFFER), "ssl_init_wbio_buffer"},

    {ERR_FUNC(SSL_F_SSL_LOAD_CLIENT_CA_FILE), "SSL_load_client_CA_file"},

    {ERR_FUNC(SSL_F_SSL_MODULE_INIT), "ssl_module_init"},

    {ERR_FUNC(SSL_F_SSL_NEW), "SSL_new"},

    {ERR_FUNC(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT),

     "ssl_parse_clienthello_renegotiate_ext"},
@@ -316,7 +318,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL_SET_WFD), "SSL_set_wfd"},

    {ERR_FUNC(SSL_F_SSL_SHUTDOWN), "SSL_shutdown"},

    {ERR_FUNC(SSL_F_SSL_SRP_CTX_INIT), "SSL_SRP_CTX_init"},

    {ERR_FUNC(SSL_F_SSL_START_ASYNC_JOB), "SSL_START_ASYNC_JOB"},

    {ERR_FUNC(SSL_F_SSL_START_ASYNC_JOB), "ssl_start_async_job"},

    {ERR_FUNC(SSL_F_SSL_UNDEFINED_CONST_FUNCTION),

     "ssl_undefined_const_function"},

    {ERR_FUNC(SSL_F_SSL_UNDEFINED_FUNCTION), "ssl_undefined_function"},
@@ -432,6 +434,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = { 
    {ERR_REASON(SSL_R_BAD_ECC_CERT), "bad ecc cert"},

    {ERR_REASON(SSL_R_BAD_ECDSA_SIGNATURE), "bad ecdsa signature"},

    {ERR_REASON(SSL_R_BAD_ECPOINT), "bad ecpoint"},

    {ERR_REASON(SSL_R_BAD_GOST_SIGNATURE), "bad gost signature"},

    {ERR_REASON(SSL_R_BAD_HANDSHAKE_LENGTH), "bad handshake length"},

    {ERR_REASON(SSL_R_BAD_HELLO_REQUEST), "bad hello request"},

    {ERR_REASON(SSL_R_BAD_LENGTH), "bad length"},
@@ -537,6 +540,8 @@ static ERR_STRING_DATA SSL_str_reasons[] = { 
    {ERR_REASON(SSL_R_INVALID_COMMAND), "invalid command"},

    {ERR_REASON(SSL_R_INVALID_COMPRESSION_ALGORITHM),

     "invalid compression algorithm"},

    {ERR_REASON(SSL_R_INVALID_CONFIGURATION_NAME),

     "invalid configuration name"},

    {ERR_REASON(SSL_R_INVALID_NULL_CMD_NAME), "invalid null cmd name"},

    {ERR_REASON(SSL_R_INVALID_PURPOSE), "invalid purpose"},

    {ERR_REASON(SSL_R_INVALID_SEQUENCE_NUMBER), "invalid sequence number"},
@@ -678,12 +683,18 @@ static ERR_STRING_DATA SSL_str_reasons[] = { 
     "sslv3 alert unexpected message"},

    {ERR_REASON(SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE),

     "sslv3 alert unsupported certificate"},

    {ERR_REASON(SSL_R_SSL_COMMAND_SECTION_EMPTY),

     "ssl command section empty"},

    {ERR_REASON(SSL_R_SSL_COMMAND_SECTION_NOT_FOUND),

     "ssl command section not found"},

    {ERR_REASON(SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION),

     "ssl ctx has no default ssl version"},

    {ERR_REASON(SSL_R_SSL_HANDSHAKE_FAILURE), "ssl handshake failure"},

    {ERR_REASON(SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS),

     "ssl library has no ciphers"},

    {ERR_REASON(SSL_R_SSL_NEGATIVE_LENGTH), "ssl negative length"},

    {ERR_REASON(SSL_R_SSL_SECTION_EMPTY), "ssl section empty"},

    {ERR_REASON(SSL_R_SSL_SECTION_NOT_FOUND), "ssl section not found"},

    {ERR_REASON(SSL_R_SSL_SESSION_ID_CALLBACK_FAILED),

     "ssl session id callback failed"},

    {ERR_REASON(SSL_R_SSL_SESSION_ID_CONFLICT), "ssl session id conflict"},
@@ -698,6 +709,8 @@ static ERR_STRING_DATA SSL_str_reasons[] = { 
     "tlsv1 alert decryption failed"},

    {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPT_ERROR),

     "tlsv1 alert decrypt error"},

    {ERR_REASON(SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),

     "tlsv1 alert export restriction"},

    {ERR_REASON(SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),

     "tlsv1 alert inappropriate fallback"},

    {ERR_REASON(SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY),
@@ -760,6 +773,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = { 
    {ERR_REASON(SSL_R_UNKNOWN_CIPHER_RETURNED), "unknown cipher returned"},

    {ERR_REASON(SSL_R_UNKNOWN_CIPHER_TYPE), "unknown cipher type"},

    {ERR_REASON(SSL_R_UNKNOWN_CMD_NAME), "unknown cmd name"},

    {ERR_REASON(SSL_R_UNKNOWN_COMMAND), "unknown command"},

    {ERR_REASON(SSL_R_UNKNOWN_DIGEST), "unknown digest"},

    {ERR_REASON(SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE),

     "unknown key exchange type"},