diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2022-10-02 16:36:43 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2022-10-02 16:36:43 +0000 |
| commit | 121f4d5e6cd8260daf18468d86d19d058e3092af (patch) | |
| tree | cc566376862eeeb77c4a1a82ccd648a03afb6f34 /lib/libssl/t1_enc.c | |
| parent | 2d6404eaa0d21ce6d72f63eea099e7c79d4a23f0 (diff) | |
Get rid of SSL_CTX_INTERNAL and SSL_INTERNAL.
These are no longer necessary due to SSL_CTX and SSL now being fully
opaque. Merge SSL_CTX_INTERNAL back into SSL_CTX and SSL_INTERNAL back
into SSL.
Prompted by tb@
Diffstat (limited to 'lib/libssl/t1_enc.c')
| -rw-r--r-- | lib/libssl/t1_enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index c996159a475..66a7aea2f50 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.154 2022/02/05 14:54:10 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.155 2022/10/02 16:36:41 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -311,13 +311,13 @@ tls1_change_cipher_state(SSL *s, int is_write) } if (!is_write) { - if (!tls12_record_layer_change_read_cipher_state(s->internal->rl, + if (!tls12_record_layer_change_read_cipher_state(s->rl, &mac_key, &key, &iv)) goto err; if (SSL_is_dtls(s)) dtls1_reset_read_seq_numbers(s); } else { - if (!tls12_record_layer_change_write_cipher_state(s->internal->rl, + if (!tls12_record_layer_change_write_cipher_state(s->rl, &mac_key, &key, &iv)) goto err; } @@ -375,8 +375,8 @@ tls1_setup_key_block(SSL *s) if (!ssl_get_handshake_evp_md(s, &handshake_hash)) return (0); - tls12_record_layer_set_aead(s->internal->rl, aead); - tls12_record_layer_set_cipher_hash(s->internal->rl, cipher, + tls12_record_layer_set_aead(s->rl, aead); + tls12_record_layer_set_cipher_hash(s->rl, cipher, handshake_hash, mac_hash); if ((key_block = tls12_key_block_new()) == NULL) @@ -387,7 +387,7 @@ tls1_setup_key_block(SSL *s) s->s3->hs.tls12.key_block = key_block; key_block = NULL; - if (!(s->internal->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) && + if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) && s->method->version <= TLS1_VERSION) { /* * Enable vulnerability countermeasure for CBC ciphers with |