diff options
| author | Matt Caswell <matt@openssl.org> | 2022-10-31 16:04:08 +0000 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2022-11-14 07:51:17 +0000 |
| commit | f471f60a8adcbb72314be974f6bc320943786b96 (patch) | |
| tree | 1e40179e21a4fd67a52b5081c9cab9bc457614a2 /ssl/ssl_local.h | |
| parent | 1e065a15119520e13a2d68d003c4c06869208a32 (diff) | |
Remove remaining refs to enc_(write|read)_ctx/(read|write)_hash
Those fields are no longer used. Their previous function is now in the new
record layer.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19586)
Diffstat (limited to 'ssl/ssl_local.h')
| -rw-r--r-- | ssl/ssl_local.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 043e9bb4fe..d568ce317b 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -1499,14 +1499,12 @@ struct ssl_connection_st { unsigned char server_app_traffic_secret[EVP_MAX_MD_SIZE]; unsigned char exporter_master_secret[EVP_MAX_MD_SIZE]; unsigned char early_exporter_master_secret[EVP_MAX_MD_SIZE]; - EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */ + unsigned char read_iv[EVP_MAX_IV_LENGTH]; /* TLSv1.3 static read IV */ - EVP_MD_CTX *read_hash; /* used for mac generation */ COMP_CTX *compress; /* compression */ COMP_CTX *expand; /* uncompress */ - EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */ unsigned char write_iv[EVP_MAX_IV_LENGTH]; /* TLSv1.3 static write IV */ - EVP_MD_CTX *write_hash; /* used for mac generation */ + /* session info */ /* client cert? */ /* This is used to hold the server certificate used */ @@ -2824,8 +2822,6 @@ __owur int ssl_security_cert_chain(SSL_CONNECTION *s, STACK_OF(X509) *sk, int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs); -__owur EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md); -void ssl_clear_hash_ctx(EVP_MD_CTX **hash); __owur long ssl_get_algorithm2(SSL_CONNECTION *s); __owur int tls12_copy_sigalgs(SSL_CONNECTION *s, WPACKET *pkt, const uint16_t *psig, size_t psiglen); |