Commit 7fe97c07 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix make update issues 



Various functions got renamed. We need to rename the error codes too.

Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent ecc2f938

include/openssl/ssl.h

+53 −47
Original line number Diff line number Diff line
@@ -2103,6 +2103,9 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_DTLS_CONSTRUCT_HELLO_VERIFY_REQUEST        385

# define SSL_F_DTLS_GET_REASSEMBLED_MESSAGE               370

# define SSL_F_DTLS_PROCESS_HELLO_VERIFY                  386

# define SSL_F_FINAL_EC_PT_FORMATS                        485

# define SSL_F_FINAL_EMS                                  486

# define SSL_F_FINAL_RENEGOTIATE                          483

# define SSL_F_OPENSSL_INIT_SSL                           342

# define SSL_F_OSSL_STATEM_CLIENT13_READ_TRANSITION       436

# define SSL_F_OSSL_STATEM_CLIENT_CONSTRUCT_MESSAGE       430
@@ -2265,62 +2268,65 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE             407

# define SSL_F_TLS_CONSTRUCT_CKE_RSA                      409

# define SSL_F_TLS_CONSTRUCT_CKE_SRP                      410

# define SSL_F_TLS_CONSTRUCT_CLIENT_ALPN                  466

# define SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE           355

# define SSL_F_TLS_CONSTRUCT_CLIENT_EC_PT_FORMATS         467

# define SSL_F_TLS_CONSTRUCT_CLIENT_EMS                   468

# define SSL_F_TLS_CONSTRUCT_CLIENT_ETM                   469

# define SSL_F_TLS_CONSTRUCT_CLIENT_HELLO                 356

# define SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE          357

# define SSL_F_TLS_CONSTRUCT_CLIENT_KEY_SHARE             470

# define SSL_F_TLS_CONSTRUCT_CLIENT_NPN                   471

# define SSL_F_TLS_CONSTRUCT_CLIENT_PADDING               472

# define SSL_F_TLS_CONSTRUCT_CLIENT_RENEGOTIATE           473

# define SSL_F_TLS_CONSTRUCT_CLIENT_SCT                   474

# define SSL_F_TLS_CONSTRUCT_CLIENT_SERVER_NAME           475

# define SSL_F_TLS_CONSTRUCT_CLIENT_SESSION_TICKET        476

# define SSL_F_TLS_CONSTRUCT_CLIENT_SIG_ALGS              477

# define SSL_F_TLS_CONSTRUCT_CLIENT_SRP                   478

# define SSL_F_TLS_CONSTRUCT_CLIENT_STATUS_REQUEST        479

# define SSL_F_TLS_CONSTRUCT_CLIENT_SUPPORTED_GROUPS      480

# define SSL_F_TLS_CONSTRUCT_CLIENT_SUPPORTED_VERSIONS    481

# define SSL_F_TLS_CONSTRUCT_CLIENT_USE_SRTP              482

# define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                358

# define SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE           484

# define SSL_F_TLS_CONSTRUCT_CLIENT_HELLO                 487

# define SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE          488

# define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                489

# define SSL_F_TLS_CONSTRUCT_CTOS_ALPN                    466

# define SSL_F_TLS_CONSTRUCT_CTOS_CERTIFICATE             355

# define SSL_F_TLS_CONSTRUCT_CTOS_EC_PT_FORMATS           467

# define SSL_F_TLS_CONSTRUCT_CTOS_EMS                     468

# define SSL_F_TLS_CONSTRUCT_CTOS_ETM                     469

# define SSL_F_TLS_CONSTRUCT_CTOS_HELLO                   356

# define SSL_F_TLS_CONSTRUCT_CTOS_KEY_EXCHANGE            357

# define SSL_F_TLS_CONSTRUCT_CTOS_KEY_SHARE               470

# define SSL_F_TLS_CONSTRUCT_CTOS_NPN                     471

# define SSL_F_TLS_CONSTRUCT_CTOS_PADDING                 472

# define SSL_F_TLS_CONSTRUCT_CTOS_RENEGOTIATE             473

# define SSL_F_TLS_CONSTRUCT_CTOS_SCT                     474

# define SSL_F_TLS_CONSTRUCT_CTOS_SERVER_NAME             475

# define SSL_F_TLS_CONSTRUCT_CTOS_SESSION_TICKET          476

# define SSL_F_TLS_CONSTRUCT_CTOS_SIG_ALGS                477

# define SSL_F_TLS_CONSTRUCT_CTOS_SRP                     478

# define SSL_F_TLS_CONSTRUCT_CTOS_STATUS_REQUEST          479

# define SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_GROUPS        480

# define SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_VERSIONS      481

# define SSL_F_TLS_CONSTRUCT_CTOS_USE_SRTP                482

# define SSL_F_TLS_CONSTRUCT_CTOS_VERIFY                  358

# define SSL_F_TLS_CONSTRUCT_ENCRYPTED_EXTENSIONS         443

# define SSL_F_TLS_CONSTRUCT_EXTENSIONS                   447

# define SSL_F_TLS_CONSTRUCT_FINISHED                     359

# define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST                373

# define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET           428

# define SSL_F_TLS_CONSTRUCT_NEXT_PROTO                   426

# define SSL_F_TLS_CONSTRUCT_SERVER_ALPN                  451

# define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE           374

# define SSL_F_TLS_CONSTRUCT_SERVER_CRYPTOPRO_BUG         452

# define SSL_F_TLS_CONSTRUCT_SERVER_DONE                  375

# define SSL_F_TLS_CONSTRUCT_SERVER_EC_PT_FORMATS         453

# define SSL_F_TLS_CONSTRUCT_SERVER_EMS                   454

# define SSL_F_TLS_CONSTRUCT_SERVER_ETM                   455

# define SSL_F_TLS_CONSTRUCT_SERVER_HELLO                 376

# define SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE          377

# define SSL_F_TLS_CONSTRUCT_SERVER_KEY_SHARE             456

# define SSL_F_TLS_CONSTRUCT_SERVER_NEXT_PROTO_NEG        457

# define SSL_F_TLS_CONSTRUCT_SERVER_RENEGOTIATE           458

# define SSL_F_TLS_CONSTRUCT_SERVER_SERVER_NAME           459

# define SSL_F_TLS_CONSTRUCT_SERVER_SESSION_TICKET        460

# define SSL_F_TLS_CONSTRUCT_SERVER_STATUS_REQUEST        461

# define SSL_F_TLS_CONSTRUCT_SERVER_USE_SRTP              462

# define SSL_F_TLS_EXT_FINAL_                             484

# define SSL_F_TLS_EXT_FINAL_EC_PT_FORMATS                485

# define SSL_F_TLS_EXT_FINAL_EMS                          486

# define SSL_F_TLS_EXT_FINAL_RENEGOTIATE                  483

# define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE           490

# define SSL_F_TLS_CONSTRUCT_SERVER_HELLO                 491

# define SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE          492

# define SSL_F_TLS_CONSTRUCT_STOC_ALPN                    451

# define SSL_F_TLS_CONSTRUCT_STOC_CERTIFICATE             374

# define SSL_F_TLS_CONSTRUCT_STOC_CRYPTOPRO_BUG           452

# define SSL_F_TLS_CONSTRUCT_STOC_DONE                    375

# define SSL_F_TLS_CONSTRUCT_STOC_EC_PT_FORMATS           453

# define SSL_F_TLS_CONSTRUCT_STOC_EMS                     454

# define SSL_F_TLS_CONSTRUCT_STOC_ETM                     455

# define SSL_F_TLS_CONSTRUCT_STOC_HELLO                   376

# define SSL_F_TLS_CONSTRUCT_STOC_KEY_EXCHANGE            377

# define SSL_F_TLS_CONSTRUCT_STOC_KEY_SHARE               456

# define SSL_F_TLS_CONSTRUCT_STOC_NEXT_PROTO_NEG          457

# define SSL_F_TLS_CONSTRUCT_STOC_RENEGOTIATE             458

# define SSL_F_TLS_CONSTRUCT_STOC_SERVER_NAME             459

# define SSL_F_TLS_CONSTRUCT_STOC_SESSION_TICKET          460

# define SSL_F_TLS_CONSTRUCT_STOC_STATUS_REQUEST          461

# define SSL_F_TLS_CONSTRUCT_STOC_USE_SRTP                462

# define SSL_F_TLS_GET_MESSAGE_BODY                       351

# define SSL_F_TLS_GET_MESSAGE_HEADER                     387

# define SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT               449

# define SSL_F_TLS_PARSE_CLIENT_KEY_SHARE                 445

# define SSL_F_TLS_PARSE_CLIENT_RENEGOTIATE               448

# define SSL_F_TLS_PARSE_CLIENT_USE_SRTP                  446

# define SSL_F_TLS_PARSE_SERVER_KEY_SHARE                 463

# define SSL_F_TLS_PARSE_SERVER_RENEGOTIATE               464

# define SSL_F_TLS_PARSE_SERVER_USE_SRTP                  465

# define SSL_F_TLS_PARSE_CTOS_KEY_SHARE                   463

# define SSL_F_TLS_PARSE_CTOS_RENEGOTIATE                 464

# define SSL_F_TLS_PARSE_CTOS_USE_SRTP                    465

# define SSL_F_TLS_PARSE_STOC_KEY_SHARE                   445

# define SSL_F_TLS_PARSE_STOC_RENEGOTIATE                 448

# define SSL_F_TLS_PARSE_STOC_USE_SRTP                    446

# 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

+72 −65
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_DTLS_GET_REASSEMBLED_MESSAGE),

     "dtls_get_reassembled_message"},

    {ERR_FUNC(SSL_F_DTLS_PROCESS_HELLO_VERIFY), "dtls_process_hello_verify"},

    {ERR_FUNC(SSL_F_FINAL_EC_PT_FORMATS), "final_ec_pt_formats"},

    {ERR_FUNC(SSL_F_FINAL_EMS), "final_ems"},

    {ERR_FUNC(SSL_F_FINAL_RENEGOTIATE), "final_renegotiate"},

    {ERR_FUNC(SSL_F_OPENSSL_INIT_SSL), "OPENSSL_init_ssl"},

    {ERR_FUNC(SSL_F_OSSL_STATEM_CLIENT13_READ_TRANSITION),

     "ossl_statem_client13_read_transition"},
@@ -265,42 +268,48 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
     "tls_construct_cke_psk_preamble"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CKE_RSA), "tls_construct_cke_rsa"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CKE_SRP), "tls_construct_cke_srp"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_ALPN), "tls_construct_client_alpn"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE),

     "tls_construct_client_certificate"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_EC_PT_FORMATS),

     "tls_construct_client_ec_pt_formats"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_EMS), "tls_construct_client_ems"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_ETM), "tls_construct_client_etm"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO),

     "tls_construct_client_hello"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE),

     "tls_construct_client_key_exchange"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_SHARE),

     "tls_construct_client_key_share"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_NPN), "tls_construct_client_npn"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_PADDING),

     "tls_construct_client_padding"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_RENEGOTIATE),

     "tls_construct_client_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_SCT), "tls_construct_client_sct"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_SERVER_NAME),

     "tls_construct_client_server_name"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_SESSION_TICKET),

     "tls_construct_client_session_ticket"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_SIG_ALGS),

     "tls_construct_client_sig_algs"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_SRP), "tls_construct_client_srp"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_STATUS_REQUEST),

     "tls_construct_client_status_request"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_SUPPORTED_GROUPS),

     "tls_construct_client_supported_groups"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_SUPPORTED_VERSIONS),

     "tls_construct_client_supported_versions"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_USE_SRTP),

     "tls_construct_client_use_srtp"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY),

     "tls_construct_client_verify"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_ALPN), "tls_construct_ctos_alpn"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_CERTIFICATE),

     "TLS_CONSTRUCT_CTOS_CERTIFICATE"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_EC_PT_FORMATS),

     "tls_construct_ctos_ec_pt_formats"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_EMS), "tls_construct_ctos_ems"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_ETM), "tls_construct_ctos_etm"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_HELLO), "TLS_CONSTRUCT_CTOS_HELLO"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_KEY_EXCHANGE),

     "TLS_CONSTRUCT_CTOS_KEY_EXCHANGE"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_KEY_SHARE),

     "tls_construct_ctos_key_share"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_NPN), "tls_construct_ctos_npn"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_PADDING),

     "tls_construct_ctos_padding"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_RENEGOTIATE),

     "tls_construct_ctos_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_SCT), "tls_construct_ctos_sct"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_SERVER_NAME),

     "tls_construct_ctos_server_name"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_SESSION_TICKET),

     "tls_construct_ctos_session_ticket"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_SIG_ALGS),

     "tls_construct_ctos_sig_algs"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_SRP), "tls_construct_ctos_srp"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_STATUS_REQUEST),

     "tls_construct_ctos_status_request"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_GROUPS),

     "tls_construct_ctos_supported_groups"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_VERSIONS),

     "tls_construct_ctos_supported_versions"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_USE_SRTP),

     "tls_construct_ctos_use_srtp"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CTOS_VERIFY), "TLS_CONSTRUCT_CTOS_VERIFY"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_ENCRYPTED_EXTENSIONS),

     "tls_construct_encrypted_extensions"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_EXTENSIONS), "tls_construct_extensions"},
@@ -310,53 +319,51 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET),

     "tls_construct_new_session_ticket"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_NEXT_PROTO), "tls_construct_next_proto"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_ALPN), "tls_construct_server_alpn"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE),

     "tls_construct_server_certificate"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_CRYPTOPRO_BUG),

     "tls_construct_server_cryptopro_bug"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_DONE), "tls_construct_server_done"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_EC_PT_FORMATS),

     "tls_construct_server_ec_pt_formats"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_EMS), "tls_construct_server_ems"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_ETM), "tls_construct_server_etm"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_HELLO),

     "tls_construct_server_hello"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE),

     "tls_construct_server_key_exchange"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_KEY_SHARE),

     "tls_construct_server_key_share"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_NEXT_PROTO_NEG),

     "tls_construct_server_next_proto_neg"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_RENEGOTIATE),

     "tls_construct_server_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_SERVER_NAME),

     "tls_construct_server_server_name"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_SESSION_TICKET),

     "tls_construct_server_session_ticket"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_STATUS_REQUEST),

     "tls_construct_server_status_request"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_USE_SRTP),

     "tls_construct_server_use_srtp"},

    {ERR_FUNC(SSL_F_TLS_EXT_FINAL_), "tls_ext_final_ems"},

    {ERR_FUNC(SSL_F_TLS_EXT_FINAL_EC_PT_FORMATS),

     "tls_ext_final_ec_pt_formats"},

    {ERR_FUNC(SSL_F_TLS_EXT_FINAL_EMS), "tls_ext_final_ems"},

    {ERR_FUNC(SSL_F_TLS_EXT_FINAL_RENEGOTIATE), "tls_ext_final_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_ALPN), "tls_construct_stoc_alpn"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_CERTIFICATE),

     "TLS_CONSTRUCT_STOC_CERTIFICATE"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_CRYPTOPRO_BUG),

     "tls_construct_stoc_cryptopro_bug"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_DONE), "TLS_CONSTRUCT_STOC_DONE"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_EC_PT_FORMATS),

     "tls_construct_stoc_ec_pt_formats"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_EMS), "tls_construct_stoc_ems"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_ETM), "tls_construct_stoc_etm"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_HELLO), "TLS_CONSTRUCT_STOC_HELLO"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_KEY_EXCHANGE),

     "TLS_CONSTRUCT_STOC_KEY_EXCHANGE"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_KEY_SHARE),

     "tls_construct_stoc_key_share"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_NEXT_PROTO_NEG),

     "tls_construct_stoc_next_proto_neg"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_RENEGOTIATE),

     "tls_construct_stoc_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_SERVER_NAME),

     "tls_construct_stoc_server_name"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_SESSION_TICKET),

     "tls_construct_stoc_session_ticket"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_STATUS_REQUEST),

     "tls_construct_stoc_status_request"},

    {ERR_FUNC(SSL_F_TLS_CONSTRUCT_STOC_USE_SRTP),

     "tls_construct_stoc_use_srtp"},

    {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_CLIENTHELLO_TLSEXT),

     "tls_parse_clienthello_tlsext"},

    {ERR_FUNC(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE),

     "tls_parse_client_key_share"},

    {ERR_FUNC(SSL_F_TLS_PARSE_CLIENT_RENEGOTIATE),

     "tls_parse_client_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_PARSE_CLIENT_USE_SRTP), "tls_parse_client_use_srtp"},

    {ERR_FUNC(SSL_F_TLS_PARSE_SERVER_KEY_SHARE),

     "tls_parse_server_key_share"},

    {ERR_FUNC(SSL_F_TLS_PARSE_SERVER_RENEGOTIATE),

     "tls_parse_server_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_PARSE_SERVER_USE_SRTP), "tls_parse_server_use_srtp"},

    {ERR_FUNC(SSL_F_TLS_PARSE_CTOS_KEY_SHARE), "tls_parse_ctos_key_share"},

    {ERR_FUNC(SSL_F_TLS_PARSE_CTOS_RENEGOTIATE),

     "tls_parse_ctos_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_PARSE_CTOS_USE_SRTP), "tls_parse_ctos_use_srtp"},

    {ERR_FUNC(SSL_F_TLS_PARSE_STOC_KEY_SHARE), "tls_parse_stoc_key_share"},

    {ERR_FUNC(SSL_F_TLS_PARSE_STOC_RENEGOTIATE),

     "tls_parse_stoc_renegotiate"},

    {ERR_FUNC(SSL_F_TLS_PARSE_STOC_USE_SRTP), "tls_parse_stoc_use_srtp"},

    {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/extensions.c

+4 −4
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static int final_renegotiate(SSL *s, unsigned int context, int sent, 
                && !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)

                && !sent) {

            *al = SSL_AD_HANDSHAKE_FAILURE;

            SSLerr(SSL_F_TLS_EXT_FINAL_RENEGOTIATE,

            SSLerr(SSL_F_FINAL_RENEGOTIATE,

                   SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);

            return 0;

        }
@@ -665,7 +665,7 @@ static int final_renegotiate(SSL *s, unsigned int context, int sent, 
            && !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)

            && !sent) {

        *al = SSL_AD_HANDSHAKE_FAILURE;

        SSLerr(SSL_F_TLS_EXT_FINAL_RENEGOTIATE,

        SSLerr(SSL_F_FINAL_RENEGOTIATE,

               SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);

        return 0;

    }
@@ -745,7 +745,7 @@ static int final_ec_pt_formats(SSL *s, unsigned int context, int sent, 
                break;

        }

        if (i == s->session->tlsext_ecpointformatlist_length) {

            SSLerr(SSL_F_TLS_EXT_FINAL_EC_PT_FORMATS,

            SSLerr(SSL_F_FINAL_EC_PT_FORMATS,

                   SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);

            return 0;

        }
@@ -889,7 +889,7 @@ static int final_ems(SSL *s, unsigned int context, int sent, int *al) 
        if (!(s->s3->flags & TLS1_FLAGS_RECEIVED_EXTMS) !=

            !(s->session->flags & SSL_SESS_FLAG_EXTMS)) {

            *al = SSL_AD_HANDSHAKE_FAILURE;

            SSLerr(SSL_F_TLS_EXT_FINAL_EMS, SSL_R_INCONSISTENT_EXTMS);

            SSLerr(SSL_F_FINAL_EMS, SSL_R_INCONSISTENT_EXTMS);

            return 0;

        }

    }

ssl/statem/extensions_clnt.c

+55 −55

File changed.

Preview size limit exceeded, changes collapsed.

ssl/statem/extensions_srvr.c

+34 −34

File changed.

Preview size limit exceeded, changes collapsed.