Commit 0d9824c1 authored by Matt Caswell's avatar Matt Caswell
Browse files

Implement tls13_change_cipher_state() 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 9362c93e

include/openssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -2242,6 +2242,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_SSL_WRITE_EX                               433

# define SSL_F_STATE_MACHINE                              353

# define SSL_F_TLS12_CHECK_PEER_SIGALG                    333

# define SSL_F_TLS13_CHANGE_CIPHER_STATE                  435

# define SSL_F_TLS1_CHANGE_CIPHER_STATE                   209

# define SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS            341

# define SSL_F_TLS1_ENC                                   401

include/openssl/ssl3.h

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ extern "C" { 
# define SSL3_CC_WRITE           0x02

# define SSL3_CC_CLIENT          0x10

# define SSL3_CC_SERVER          0x20

# define SSL3_CC_HANDSHAKE       0x40

# define SSL3_CC_APPLICATION     0x80

# define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE)

# define SSL3_CHANGE_CIPHER_SERVER_READ  (SSL3_CC_SERVER|SSL3_CC_READ)

# define SSL3_CHANGE_CIPHER_CLIENT_READ  (SSL3_CC_CLIENT|SSL3_CC_READ)

ssl/ssl_err.c

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL_WRITE_EX), "SSL_write_ex"},

    {ERR_FUNC(SSL_F_STATE_MACHINE), "state_machine"},

    {ERR_FUNC(SSL_F_TLS12_CHECK_PEER_SIGALG), "tls12_check_peer_sigalg"},

    {ERR_FUNC(SSL_F_TLS13_CHANGE_CIPHER_STATE), "tls13_change_cipher_state"},

    {ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE), "tls1_change_cipher_state"},

    {ERR_FUNC(SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS),

     "tls1_check_duplicate_extensions"},

ssl/ssl_lib.c

+1 −2
Original line number Diff line number Diff line
@@ -3828,7 +3828,6 @@ EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md) 
void ssl_clear_hash_ctx(EVP_MD_CTX **hash)

{



    if (*hash)

    EVP_MD_CTX_free(*hash);

    *hash = NULL;

}

ssl/ssl_locl.h

+1 −0
Original line number Diff line number Diff line
@@ -2003,6 +2003,7 @@ __owur size_t tls1_final_finish_mac(SSL *s, const char *str, size_t slen, 
__owur int tls1_generate_master_secret(SSL *s, unsigned char *out,

                                       unsigned char *p, size_t len,

                                       size_t *secret_size);

__owur int tls13_change_cipher_state(SSL *s, int which);

__owur int tls13_derive_secret(SSL *s, const unsigned char *insecret,

                               const unsigned char *label, size_t labellen,

                               unsigned char *secret);