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.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index c996159a47..66a7aea2f5 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.154 2022/02/05 14:54:10 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.155 2022/10/02 16:36:41 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 *
@@ -311,13 +311,13 @@ tls1_change_cipher_state(SSL *s, int is_write)
311 } 311 }
312 312
313 if (!is_write) { 313 if (!is_write) {
314 if (!tls12_record_layer_change_read_cipher_state(s->internal->rl, 314 if (!tls12_record_layer_change_read_cipher_state(s->rl,
315 &mac_key, &key, &iv)) 315 &mac_key, &key, &iv))
316 goto err; 316 goto err;
317 if (SSL_is_dtls(s)) 317 if (SSL_is_dtls(s))
318 dtls1_reset_read_seq_numbers(s); 318 dtls1_reset_read_seq_numbers(s);
319 } else { 319 } else {
320 if (!tls12_record_layer_change_write_cipher_state(s->internal->rl, 320 if (!tls12_record_layer_change_write_cipher_state(s->rl,
321 &mac_key, &key, &iv)) 321 &mac_key, &key, &iv))
322 goto err; 322 goto err;
323 } 323 }
@@ -375,8 +375,8 @@ tls1_setup_key_block(SSL *s)
375 if (!ssl_get_handshake_evp_md(s, &handshake_hash)) 375 if (!ssl_get_handshake_evp_md(s, &handshake_hash))
376 return (0); 376 return (0);
377 377
378 tls12_record_layer_set_aead(s->internal->rl, aead); 378 tls12_record_layer_set_aead(s->rl, aead);
379 tls12_record_layer_set_cipher_hash(s->internal->rl, cipher, 379 tls12_record_layer_set_cipher_hash(s->rl, cipher,
380 handshake_hash, mac_hash); 380 handshake_hash, mac_hash);
381 381
382 if ((key_block = tls12_key_block_new()) == NULL) 382 if ((key_block = tls12_key_block_new()) == NULL)
@@ -387,7 +387,7 @@ tls1_setup_key_block(SSL *s)
387 s->s3->hs.tls12.key_block = key_block; 387 s->s3->hs.tls12.key_block = key_block;
388 key_block = NULL; 388 key_block = NULL;
389 389
390 if (!(s->internal->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) && 390 if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) &&
391 s->method->version <= TLS1_VERSION) { 391 s->method->version <= TLS1_VERSION) {
392 /* 392 /*
393 * Enable vulnerability countermeasure for CBC ciphers with 393 * Enable vulnerability countermeasure for CBC ciphers with