From 2fe043a6d1e498b24006b925cf9fe6b3fe090c74 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Wed, 9 Sep 2020 10:57:24 +0100 Subject: [PATCH] Remove guard for TLS 1.3 specific declarations We only guard the implementations of modules, not their declarations. Signed-off-by: Hanno Becker --- include/mbedtls/ssl_internal.h | 4 ---- library/ssl_tls13_keys.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h index c6847ba58..188b94771 100644 --- a/include/mbedtls/ssl_internal.h +++ b/include/mbedtls/ssl_internal.h @@ -399,9 +399,6 @@ typedef int mbedtls_ssl_tls_prf_cb( const unsigned char *secret, size_t slen, #define MBEDTLS_SSL_MAX_IV_LENGTH 16 #define MBEDTLS_SSL_MAX_KEY_LENGTH 32 - -#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) - /** * \brief The data structure holding the cryptographic material (key and IV) * used for record protection in TLS 1.3. @@ -423,7 +420,6 @@ struct mbedtls_ssl_key_set * server_write_iv, in Bytes. */ }; typedef struct mbedtls_ssl_key_set mbedtls_ssl_key_set; -#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */ /* * This structure contains the parameters only needed during handshake. diff --git a/library/ssl_tls13_keys.h b/library/ssl_tls13_keys.h index 4bd2d47a3..33becd6cc 100644 --- a/library/ssl_tls13_keys.h +++ b/library/ssl_tls13_keys.h @@ -19,8 +19,6 @@ #if !defined(MBEDTLS_SSL_TLS1_3_KEYS_H) #define MBEDTLS_SSL_TLS1_3_KEYS_H -#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) - /* This requires MBEDTLS_SSL_TLS1_3_LABEL( idx, name, string ) to be defined at * the point of use. See e.g. the definition of mbedtls_ssl_tls1_3_labels_union * below. */ @@ -264,6 +262,4 @@ int mbedtls_ssl_tls1_3_evolve_secret( const unsigned char *input, size_t input_len, unsigned char *secret_new ); -#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */ - #endif /* MBEDTLS_SSL_TLS1_3_KEYS_H */