From 084649d189a9e25f065d420b38f6383793896e1e Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 17 May 2022 11:33:55 +0200 Subject: [PATCH] SHA-3 does not use SHA3_ALT anymore. Next releases will not use alt files. Signed-off-by: Pol Henarejos --- include/mbedtls/mbedtls_config.h | 1 - include/mbedtls/sha3.h | 8 -------- library/sha3.c | 4 ---- 3 files changed, 13 deletions(-) diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index 35a4a0cbd..bfaa5f982 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -328,7 +328,6 @@ //#define MBEDTLS_SHA1_ALT //#define MBEDTLS_SHA256_ALT //#define MBEDTLS_SHA512_ALT -//#define MBEDTLS_SHA3_ALT /* * When replacing the elliptic curve module, pleace consider, that it is diff --git a/include/mbedtls/sha3.h b/include/mbedtls/sha3.h index adecdc722..36942db88 100644 --- a/include/mbedtls/sha3.h +++ b/include/mbedtls/sha3.h @@ -55,10 +55,6 @@ typedef enum MBEDTLS_SHA3_512, /*!< SHA3-512 */ } mbedtls_sha3_id; -#if !defined(MBEDTLS_SHA3_ALT) -// Regular implementation -// - struct mbedtls_sha3_context; typedef struct mbedtls_sha3_family_functions { @@ -87,10 +83,6 @@ typedef struct mbedtls_sha3_context { } mbedtls_sha3_context; -#else /* MBEDTLS_SHA3_ALT */ -#include "sha3_alt.h" -#endif /* MBEDTLS_SHA3_ALT */ - /** * \brief This function initializes a SHA-3 context. * diff --git a/library/sha3.c b/library/sha3.c index d5db165fb..4a08131e6 100644 --- a/library/sha3.c +++ b/library/sha3.c @@ -44,8 +44,6 @@ #endif /* MBEDTLS_PLATFORM_C */ #endif /* MBEDTLS_SELF_TEST */ -#if !defined(MBEDTLS_SHA3_ALT) - /* * List of supported SHA-3 families */ @@ -268,8 +266,6 @@ int mbedtls_sha3_finish( mbedtls_sha3_context *ctx, return( 0 ); } -#endif /* !MBEDTLS_SHA3_ALT */ - /* * output = SHA3( input buffer ) */