diff options
| author |   jsing <jsing@openbsd.org> | 2018-10-24 18:04:50 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-10-24 18:04:50 +0000 |
| commit | 75f936372975e26103c3e2d047e08f604921981d (patch) | |
| tree | 62308cd31463bb4f6571ca818460aa9559da01e5 /lib/libssl/t1_enc.c | |
| parent | Remove a GOST data symbol that should not be exported. (diff) | |
| download | wireguard-openbsd-75f936372975e26103c3e2d047e08f604921981d.tar.xz wireguard-openbsd-75f936372975e26103c3e2d047e08f604921981d.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 'lib/libssl/t1_enc.c')
| -rw-r--r-- | lib/libssl/t1_enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index b8ebf524170..2a38d8de6a2 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.114 2018/09/08 14:39:41 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.115 2018/10/24 18:04:50 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -579,7 +579,7 @@ tls1_change_cipher_state(SSL *s, int which) iv_len = EVP_CIPHER_iv_length(cipher); } - mac_secret_size = s->s3->tmp.new_mac_secret_size; + mac_secret_size = S3I(s)->tmp.new_mac_secret_size; key_block = S3I(s)->hs.key_block; client_write_mac_secret = key_block; @@ -666,7 +666,7 @@ tls1_setup_key_block(SSL *s) S3I(s)->tmp.new_sym_enc = cipher; S3I(s)->tmp.new_hash = mac; S3I(s)->tmp.new_mac_pkey_type = mac_type; - s->s3->tmp.new_mac_secret_size = mac_secret_size; + S3I(s)->tmp.new_mac_secret_size = mac_secret_size; tls1_cleanup_key_block(s); |