diff options
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
| -rw-r--r-- | src/lib/libssl/t1_enc.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index 7a71a08434..debbf286f6 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_enc.c,v 1.124 2020/10/03 17:35:16 jsing Exp $ */ | 1 | /* $OpenBSD: t1_enc.c,v 1.125 2020/10/07 08:43:34 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -423,11 +423,6 @@ tls1_change_cipher_state_cipher(SSL *s, char is_read, | |||
| 423 | stream_mac = S3I(s)->hs.new_cipher->algorithm2 & TLS1_STREAM_MAC; | 423 | stream_mac = S3I(s)->hs.new_cipher->algorithm2 & TLS1_STREAM_MAC; |
| 424 | 424 | ||
| 425 | if (is_read) { | 425 | if (is_read) { |
| 426 | if (stream_mac) | ||
| 427 | s->internal->mac_flags |= SSL_MAC_FLAG_READ_MAC_STREAM; | ||
| 428 | else | ||
| 429 | s->internal->mac_flags &= ~SSL_MAC_FLAG_READ_MAC_STREAM; | ||
| 430 | |||
| 431 | ssl_clear_cipher_read_state(s); | 426 | ssl_clear_cipher_read_state(s); |
| 432 | 427 | ||
| 433 | if ((cipher_ctx = EVP_CIPHER_CTX_new()) == NULL) | 428 | if ((cipher_ctx = EVP_CIPHER_CTX_new()) == NULL) |
| @@ -445,11 +440,6 @@ tls1_change_cipher_state_cipher(SSL *s, char is_read, | |||
| 445 | S3I(s)->read_mac_secret, mac_secret_size)) | 440 | S3I(s)->read_mac_secret, mac_secret_size)) |
| 446 | goto err; | 441 | goto err; |
| 447 | } else { | 442 | } else { |
| 448 | if (stream_mac) | ||
| 449 | s->internal->mac_flags |= SSL_MAC_FLAG_WRITE_MAC_STREAM; | ||
| 450 | else | ||
| 451 | s->internal->mac_flags &= ~SSL_MAC_FLAG_WRITE_MAC_STREAM; | ||
| 452 | |||
| 453 | /* | 443 | /* |
| 454 | * DTLS fragments retain a pointer to the compression, cipher | 444 | * DTLS fragments retain a pointer to the compression, cipher |
| 455 | * and hash contexts, so that it can restore state in order | 445 | * and hash contexts, so that it can restore state in order |
| @@ -581,9 +571,6 @@ tls1_change_cipher_state(SSL *s, int which) | |||
| 581 | if (is_read) { | 571 | if (is_read) { |
| 582 | memcpy(S3I(s)->read_mac_secret, mac_secret, mac_secret_size); | 572 | memcpy(S3I(s)->read_mac_secret, mac_secret, mac_secret_size); |
| 583 | S3I(s)->read_mac_secret_size = mac_secret_size; | 573 | S3I(s)->read_mac_secret_size = mac_secret_size; |
| 584 | } else { | ||
| 585 | memcpy(S3I(s)->write_mac_secret, mac_secret, mac_secret_size); | ||
| 586 | S3I(s)->write_mac_secret_size = mac_secret_size; | ||
| 587 | } | 574 | } |
| 588 | 575 | ||
| 589 | if (aead != NULL) { | 576 | if (aead != NULL) { |
