summaryrefslogtreecommitdiffstats
path: root/ssl/s3_enc.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2022-09-23 12:59:22 +0100
committerMatt Caswell <matt@openssl.org>2022-10-12 15:53:31 +0100
commit4bf610bdce3b0e474c5ce7db5be77e152f3649b6 (patch)
treea5ac253df4fe3ca2eba95f48ea846835dc7f9844 /ssl/s3_enc.c
parent2f6e24eb5bd6a3ea4c5e18ff003acc4e812b527f (diff)
Remove enc_write_state
This field was used to track whether a cipher ctx was valid for writing or not, and also whether we should write out plaintext alerts. With the new record layer design we no longer need to track whether a cipher ctx is valid since the whole record layer will be aborted if it is not. Also we have a different mechanism for tracking whether we should write out plaintext alerts. Therefore this field is removed from the SSL object. Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19343)
Diffstat (limited to 'ssl/s3_enc.c')
-rw-r--r--ssl/s3_enc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 26471c3784..67123c7372 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -143,9 +143,6 @@ int ssl3_change_cipher_state(SSL_CONNECTION *s, int which)
goto err;
}
- if ((which & SSL3_CC_WRITE) != 0)
- s->statem.enc_write_state = ENC_WRITE_STATE_INVALID;
-
if (!ssl_set_new_record_layer(s, SSL3_VERSION,
direction,
OSSL_RECORD_PROTECTION_LEVEL_APPLICATION,
@@ -155,7 +152,6 @@ int ssl3_change_cipher_state(SSL_CONNECTION *s, int which)
goto err;
}
- s->statem.enc_write_state = ENC_WRITE_STATE_VALID;
return 1;
err:
return 0;