summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
-rw-r--r--src/lib/libssl/t1_enc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index d451ad531c..6c376be2e0 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.127 2020/11/11 18:14:12 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.128 2021/01/07 15:32:59 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 *
@@ -434,7 +434,7 @@ tls1_change_cipher_state_cipher(SSL *s, char is_read,
434 goto err; 434 goto err;
435 435
436 if (!tls12_record_layer_set_read_mac_key(s->internal->rl, 436 if (!tls12_record_layer_set_read_mac_key(s->internal->rl,
437 S3I(s)->read_mac_secret, mac_secret_size)) 437 mac_secret, mac_secret_size))
438 goto err; 438 goto err;
439 } else { 439 } else {
440 /* 440 /*
@@ -565,11 +565,6 @@ tls1_change_cipher_state(SSL *s, int which)
565 goto err2; 565 goto err2;
566 } 566 }
567 567
568 if (is_read) {
569 memcpy(S3I(s)->read_mac_secret, mac_secret, mac_secret_size);
570 S3I(s)->read_mac_secret_size = mac_secret_size;
571 }
572
573 if (aead != NULL) { 568 if (aead != NULL) {
574 return tls1_change_cipher_state_aead(s, is_read, key, key_len, 569 return tls1_change_cipher_state_aead(s, is_read, key, key_len,
575 iv, iv_len); 570 iv, iv_len);