diff options
| author | Matt Caswell <matt@openssl.org> | 2022-07-26 12:44:09 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2022-08-18 16:38:14 +0100 |
| commit | 19d00444488c0a5861911ac8ba6b71c5c1f6c19a (patch) | |
| tree | 368c8f0933e244de50f0ba2673931fa24f606032 /ssl/tls13_enc.c | |
| parent | a16f9d3366a4b4e8c8014bbf39b86baaf1a04047 (diff) | |
Remove some redundant code
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18132)
Diffstat (limited to 'ssl/tls13_enc.c')
| -rw-r--r-- | ssl/tls13_enc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 437deaa993..0af8ad2918 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -472,8 +472,6 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which) if (which & SSL3_CC_READ) { iv = s->read_iv; - - RECORD_LAYER_reset_read_sequence(&s->rlayer); } else { s->statem.enc_write_state = ENC_WRITE_STATE_INVALID; if (s->enc_write_ctx != NULL) { @@ -763,10 +761,11 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which) } /* configure kernel crypto structure */ - if (which & SSL3_CC_WRITE) - rl_sequence = RECORD_LAYER_get_write_sequence(&s->rlayer); - else - rl_sequence = RECORD_LAYER_get_read_sequence(&s->rlayer); + /* + * If we get here we are only doing the write side. The read side goes + * through the new record layer code. + */ + rl_sequence = RECORD_LAYER_get_write_sequence(&s->rlayer); if (!ktls_configure_crypto(sctx->libctx, s->version, cipher, NULL, rl_sequence, &crypto_info, which & SSL3_CC_WRITE, @@ -821,7 +820,6 @@ int tls13_update_key(SSL_CONNECTION *s, int sending) } else { iv = s->read_iv; ciph_ctx = s->enc_read_ctx; - RECORD_LAYER_reset_read_sequence(&s->rlayer); } if (!derive_secret_key_and_iv(s, sending, md, |