Commit 6594189f authored by Matt Caswell's avatar Matt Caswell
Browse files

Merge early_data_info extension into early_data 



As per draft-19

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2895)
parent ef6c191b

include/openssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_TLS_PARSE_CTOS_RENEGOTIATE                 464

# define SSL_F_TLS_PARSE_CTOS_USE_SRTP                    465

# define SSL_F_TLS_PARSE_STOC_COOKIE                      534

# define SSL_F_TLS_PARSE_STOC_EARLY_DATA                  538

# define SSL_F_TLS_PARSE_STOC_EARLY_DATA_INFO             528

# define SSL_F_TLS_PARSE_STOC_KEY_SHARE                   445

# define SSL_F_TLS_PARSE_STOC_PSK                         502

include/openssl/tls1.h

+0 −1
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ extern "C" { 
# define TLSEXT_TYPE_supported_versions          43

# define TLSEXT_TYPE_cookie                      44

# define TLSEXT_TYPE_psk_kex_modes               45

# define TLSEXT_TYPE_early_data_info             46



/* Temporary extension type */

# define TLSEXT_TYPE_renegotiate                 0xff01

ssl/ssl_err.c

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
     "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_COOKIE), "tls_parse_stoc_cookie"},

    {ERR_FUNC(SSL_F_TLS_PARSE_STOC_EARLY_DATA), "tls_parse_stoc_early_data"},

    {ERR_FUNC(SSL_F_TLS_PARSE_STOC_EARLY_DATA_INFO),

     "tls_parse_stoc_early_data_info"},

    {ERR_FUNC(SSL_F_TLS_PARSE_STOC_KEY_SHARE), "tls_parse_stoc_key_share"},

ssl/ssl_locl.h

+0 −1
Original line number Diff line number Diff line
@@ -1791,7 +1791,6 @@ typedef enum tlsext_index_en { 
    TLSEXT_IDX_renegotiate,

    TLSEXT_IDX_server_name,

    TLSEXT_IDX_srp,

    TLSEXT_IDX_early_data_info,

    TLSEXT_IDX_ec_point_formats,

    TLSEXT_IDX_supported_groups,

    TLSEXT_IDX_session_ticket,

ssl/statem/extensions.c

+2 −7
Original line number Diff line number Diff line
@@ -131,12 +131,6 @@ static const EXTENSION_DEFINITION ext_defs[] = { 
#else

    INVALID_EXTENSION,

#endif

    {

        TLSEXT_TYPE_early_data_info,

        EXT_TLS1_3_NEW_SESSION_TICKET,

        NULL, NULL, tls_parse_stoc_early_data_info,

        tls_construct_stoc_early_data_info, NULL, NULL

    },

#ifndef OPENSSL_NO_EC

    {

        TLSEXT_TYPE_ec_point_formats,
@@ -287,7 +281,8 @@ static const EXTENSION_DEFINITION ext_defs[] = { 
    },

    {

        TLSEXT_TYPE_early_data,

        EXT_CLIENT_HELLO | EXT_TLS1_3_ENCRYPTED_EXTENSIONS,

        EXT_CLIENT_HELLO | EXT_TLS1_3_ENCRYPTED_EXTENSIONS

        | EXT_TLS1_3_NEW_SESSION_TICKET,

        NULL, tls_parse_ctos_early_data, tls_parse_stoc_early_data,

        tls_construct_stoc_early_data, tls_construct_ctos_early_data,

        final_early_data