summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_local.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2022-05-20 16:54:12 +0100
committerMatt Caswell <matt@openssl.org>2022-08-18 16:38:12 +0100
commit7f2f0ac7bfdd676cd919dd94b971874eade41830 (patch)
treec122a2279d2735c70737bcbd1d16dd84a3bff139 /ssl/ssl_local.h
parent88d616805cab4fd052bcff890627668a8f4bae33 (diff)
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 <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18132)
Diffstat (limited to 'ssl/ssl_local.h')
-rw-r--r--ssl/ssl_local.h12
1 files changed, 6 insertions, 6 deletions
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);