diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index a2d57fcce..007a22dc2 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -352,7 +352,6 @@ //#define MBEDTLS_CMAC_ALT //#define MBEDTLS_MD5_ALT -//#define MBEDTLS_RIPEMD160_ALT //#define MBEDTLS_SHA256_ALT //#define MBEDTLS_SHA512_ALT diff --git a/tests/include/alt-dummy/ripemd160_alt.h b/tests/include/alt-dummy/ripemd160_alt.h deleted file mode 100644 index 72ae47efb..000000000 --- a/tests/include/alt-dummy/ripemd160_alt.h +++ /dev/null @@ -1,16 +0,0 @@ -/* ripemd160_alt.h with dummy types for MBEDTLS_RIPEMD160_ALT */ -/* - * Copyright The Mbed TLS Contributors - * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later - */ - -#ifndef RIPEMD160_ALT_H -#define RIPEMD160_ALT_H - -typedef struct mbedtls_ripemd160_context { - int dummy; -} -mbedtls_ripemd160_context; - - -#endif /* ripemd160_alt.h */ diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/ripemd160.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/ripemd160.h index 279f92b51..570ab2e44 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/ripemd160.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/ripemd160.h @@ -20,10 +20,6 @@ extern "C" { #endif -#if !defined(MBEDTLS_RIPEMD160_ALT) -// Regular implementation -// - /** * \brief RIPEMD-160 context structure */ @@ -34,10 +30,6 @@ typedef struct mbedtls_ripemd160_context { } mbedtls_ripemd160_context; -#else /* MBEDTLS_RIPEMD160_ALT */ -#include "ripemd160_alt.h" -#endif /* MBEDTLS_RIPEMD160_ALT */ - /** * \brief Initialize RIPEMD-160 context * diff --git a/tf-psa-crypto/drivers/builtin/src/ripemd160.c b/tf-psa-crypto/drivers/builtin/src/ripemd160.c index b4fc3cdba..96b546654 100644 --- a/tf-psa-crypto/drivers/builtin/src/ripemd160.c +++ b/tf-psa-crypto/drivers/builtin/src/ripemd160.c @@ -23,8 +23,6 @@ #include "mbedtls/platform.h" -#if !defined(MBEDTLS_RIPEMD160_ALT) - void mbedtls_ripemd160_init(mbedtls_ripemd160_context *ctx) { memset(ctx, 0, sizeof(mbedtls_ripemd160_context)); @@ -365,8 +363,6 @@ exit: return ret; } -#endif /* ! MBEDTLS_RIPEMD160_ALT */ - /* * output = RIPEMD-160( input buffer ) */