summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
authorjsing <>2018-10-24 18:04:50 +0000
committerjsing <>2018-10-24 18:04:50 +0000
commitd7e0aa4b59fc46f038370bf8dc64821eb4a7d804 (patch)
treece8dad95e6021ab405b0ec175b26682e47bea424 /src/lib/libssl/t1_enc.c
parentc988048231bcb1d2abd6613e83760d63c461a080 (diff)
downloadopenbsd-d7e0aa4b59fc46f038370bf8dc64821eb4a7d804.tar.gz
openbsd-d7e0aa4b59fc46f038370bf8dc64821eb4a7d804.tar.bz2
openbsd-d7e0aa4b59fc46f038370bf8dc64821eb4a7d804.zip
Make more of libssl's record layer state internal.
In January 2017, we changed large amounts of libssl's data structures to be non-visible/internal, however intentionally left things that the software ecosystem was needing to use. The four or so applications that reached into libssl for record layer related state now implement alternative code. As such, make these data structures internal. ok tb@
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
-rw-r--r--src/lib/libssl/t1_enc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index b8ebf52417..2a38d8de6a 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.114 2018/09/08 14:39:41 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.115 2018/10/24 18:04:50 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 *
@@ -579,7 +579,7 @@ tls1_change_cipher_state(SSL *s, int which)
579 iv_len = EVP_CIPHER_iv_length(cipher); 579 iv_len = EVP_CIPHER_iv_length(cipher);
580 } 580 }
581 581
582 mac_secret_size = s->s3->tmp.new_mac_secret_size; 582 mac_secret_size = S3I(s)->tmp.new_mac_secret_size;
583 583
584 key_block = S3I(s)->hs.key_block; 584 key_block = S3I(s)->hs.key_block;
585 client_write_mac_secret = key_block; 585 client_write_mac_secret = key_block;
@@ -666,7 +666,7 @@ tls1_setup_key_block(SSL *s)
666 S3I(s)->tmp.new_sym_enc = cipher; 666 S3I(s)->tmp.new_sym_enc = cipher;
667 S3I(s)->tmp.new_hash = mac; 667 S3I(s)->tmp.new_hash = mac;
668 S3I(s)->tmp.new_mac_pkey_type = mac_type; 668 S3I(s)->tmp.new_mac_pkey_type = mac_type;
669 s->s3->tmp.new_mac_secret_size = mac_secret_size; 669 S3I(s)->tmp.new_mac_secret_size = mac_secret_size;
670 670
671 tls1_cleanup_key_block(s); 671 tls1_cleanup_key_block(s);
672 672