From 7f2f0ac7bfdd676cd919dd94b971874eade41830 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 20 May 2022 16:54:12 +0100 Subject: Make the record layer directly aware of EtM We no longer have to go through the SSL object to discover whether EtM has been negotiated. Reviewed-by: Hugo Landau Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/18132) --- ssl/ssl_local.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ssl/ssl_local.h') diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index b4920a1c12..16cb7d64db 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -2861,12 +2861,12 @@ __owur int ssl_log_secret(SSL_CONNECTION *s, const char *label, # ifndef OPENSSL_NO_KTLS /* ktls.c */ int ktls_check_supported_cipher(const SSL_CONNECTION *s, const EVP_CIPHER *c, - size_t taglen); -int ktls_configure_crypto(SSL_CONNECTION *s, const EVP_CIPHER *c, - void *rl_sequence, ktls_crypto_info_t *crypto_info, - int is_tx, unsigned char *iv, size_t ivlen, - unsigned char *key, size_t keylen, - unsigned char *mac_key, size_t mac_secret_size); + const EVP_MD *md, size_t taglen); +int ktls_configure_crypto(SSL_CONNECTION *s, const EVP_CIPHER *c, void *rl_sequence, + ktls_crypto_info_t *crypto_info, int is_tx, + unsigned char *iv, size_t ivlen, unsigned char *key, + size_t keylen, unsigned char *mac_key, + size_t mac_secret_size); # endif __owur int srp_generate_server_master_secret(SSL_CONNECTION *s); -- cgit v1.2.3