Commit 801cb720 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix make update following extensions refactor 



Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent de7d61d5

include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -2233,6 +2233,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLS1_SETUP_KEY_BLOCK                       211

# define SSL_F_TLS1_SET_SERVER_SIGALGS                    335

# define SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK          354

# define SSL_F_TLS_COLLECT_EXTENSIONS                     435

# define SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST          372

# define SSL_F_TLS_CONSTRUCT_CERT_STATUS                  429

# define SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC           427
@@ -2256,7 +2257,6 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE          377

# define SSL_F_TLS_GET_MESSAGE_BODY                       351

# define SSL_F_TLS_GET_MESSAGE_HEADER                     387

# define SSL_F_TLS_PARSE_RAW_EXTENSIONS                   432

# define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO              378

# define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE       384

# define SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE             360

ssl/ssl_err.c

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

    {ERR_FUNC(SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK),

     "tls_client_key_exchange_post_work"},

    {ERR_FUNC(SSL_F_TLS_COLLECT_EXTENSIONS), "tls_collect_extensions"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST),

     "tls_construct_certificate_request"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CERT_STATUS), "tls_construct_cert_status"},
@@ -279,7 +280,6 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
     "tls_construct_server_key_exchange"},

    {ERR_FUNC(SSL_F_TLS_GET_MESSAGE_BODY), "tls_get_message_body"},

    {ERR_FUNC(SSL_F_TLS_GET_MESSAGE_HEADER), "tls_get_message_header"},

    {ERR_FUNC(SSL_F_TLS_PARSE_RAW_EXTENSIONS), "tls_parse_raw_extensions"},

    {ERR_FUNC(SSL_F_TLS_POST_PROCESS_CLIENT_HELLO),

     "tls_post_process_client_hello"},

    {ERR_FUNC(SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE),

ssl/statem/statem_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ int tls_collect_extensions(PACKET *packet, RAW_EXTENSION **res, 
                                        * num_extensions);

        if (raw_extensions == NULL) {

            *ad = SSL_AD_INTERNAL_ERROR;

            SSLerr(SSL_F_TLS_PARSE_RAW_EXTENSIONS, ERR_R_MALLOC_FAILURE);

            SSLerr(SSL_F_TLS_COLLECT_EXTENSIONS, ERR_R_MALLOC_FAILURE);

            goto err;

        }
@@ -215,14 +215,14 @@ int tls_collect_extensions(PACKET *packet, RAW_EXTENSION **res, 
                                              &raw_extensions[i].data)) {

                /* This should not happen. */

                *ad = SSL_AD_INTERNAL_ERROR;

                SSLerr(SSL_F_TLS_PARSE_RAW_EXTENSIONS, ERR_R_INTERNAL_ERROR);

                SSLerr(SSL_F_TLS_COLLECT_EXTENSIONS, ERR_R_INTERNAL_ERROR);

                goto err;

            }

        }



        if (PACKET_remaining(packet) != 0) {

            *ad = SSL_AD_DECODE_ERROR;

            SSLerr(SSL_F_TLS_PARSE_RAW_EXTENSIONS, SSL_R_LENGTH_MISMATCH);

            SSLerr(SSL_F_TLS_COLLECT_EXTENSIONS, SSL_R_LENGTH_MISMATCH);

            goto err;

        }

        /* Sort the extensions and make sure there are no duplicates. */