Commit 870063c8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Normalise make errors output 



make errors wants things in a different order to the way things are
currently defined in the header files. The easiest fix is to just let it
reorder it.

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

include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -2016,7 +2016,6 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_SSL_CTX_SET_TRUST                          229

# define SSL_F_SSL_CTX_USE_CERTIFICATE                    171

# define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1               172

# define SSL_F_USE_CERTIFICATE_CHAIN_FILE                 220

# define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE               173

# define SSL_F_SSL_CTX_USE_PRIVATEKEY                     174

# define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1                175
@@ -2097,6 +2096,7 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_TLS1_PROCESS_HEARTBEAT                     341

# define SSL_F_TLS1_SETUP_KEY_BLOCK                       211

# define SSL_F_TLS1_SET_SERVER_SIGALGS                    335

# define SSL_F_USE_CERTIFICATE_CHAIN_FILE                 220



/* Reason codes. */

# define SSL_R_APP_DATA_IN_HANDSHAKE                      100

ssl/ssl_err.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL_CTX_USE_CERTIFICATE), "SSL_CTX_use_certificate"},

    {ERR_FUNC(SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1),

     "SSL_CTX_use_certificate_ASN1"},

    {ERR_FUNC(SSL_F_USE_CERTIFICATE_CHAIN_FILE), "use_certificate_chain_file"},

    {ERR_FUNC(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE),

     "SSL_CTX_use_certificate_file"},

    {ERR_FUNC(SSL_F_SSL_CTX_USE_PRIVATEKEY), "SSL_CTX_use_PrivateKey"},
@@ -331,6 +330,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_TLS1_PROCESS_HEARTBEAT), "tls1_process_heartbeat"},

    {ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK), "tls1_setup_key_block"},

    {ERR_FUNC(SSL_F_TLS1_SET_SERVER_SIGALGS), "tls1_set_server_sigalgs"},

    {ERR_FUNC(SSL_F_USE_CERTIFICATE_CHAIN_FILE), "use_certificate_chain_file"},

    {0, NULL}

};