Latest update - pre9
This commit is contained in:
+7
-4
@@ -425,7 +425,7 @@ int tls13_change_cipher_state(SSL *s, int which)
|
||||
|
||||
RECORD_LAYER_reset_read_sequence(&s->rlayer);
|
||||
} else {
|
||||
s->statem.invalid_enc_write_ctx = 1;
|
||||
s->statem.enc_write_state = ENC_WRITE_STATE_INVALID;
|
||||
if (s->enc_write_ctx != NULL) {
|
||||
EVP_CIPHER_CTX_reset(s->enc_write_ctx);
|
||||
} else {
|
||||
@@ -648,7 +648,10 @@ int tls13_change_cipher_state(SSL *s, int which)
|
||||
goto err;
|
||||
}
|
||||
|
||||
s->statem.invalid_enc_write_ctx = 0;
|
||||
if (!s->server && label == client_early_traffic)
|
||||
s->statem.enc_write_state = ENC_WRITE_STATE_WRITE_PLAIN_ALERTS;
|
||||
else
|
||||
s->statem.enc_write_state = ENC_WRITE_STATE_VALID;
|
||||
ret = 1;
|
||||
err:
|
||||
OPENSSL_cleanse(secret, sizeof(secret));
|
||||
@@ -671,7 +674,7 @@ int tls13_update_key(SSL *s, int sending)
|
||||
insecret = s->client_app_traffic_secret;
|
||||
|
||||
if (sending) {
|
||||
s->statem.invalid_enc_write_ctx = 1;
|
||||
s->statem.enc_write_state = ENC_WRITE_STATE_INVALID;
|
||||
iv = s->write_iv;
|
||||
ciph_ctx = s->enc_write_ctx;
|
||||
RECORD_LAYER_reset_write_sequence(&s->rlayer);
|
||||
@@ -692,7 +695,7 @@ int tls13_update_key(SSL *s, int sending)
|
||||
|
||||
memcpy(insecret, secret, hashlen);
|
||||
|
||||
s->statem.invalid_enc_write_ctx = 0;
|
||||
s->statem.enc_write_state = ENC_WRITE_STATE_VALID;
|
||||
ret = 1;
|
||||
err:
|
||||
OPENSSL_cleanse(secret, sizeof(secret));
|
||||
|
||||
Reference in New Issue
Block a user