cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-29 08:24:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove MBEDTLS_GCM_ALT

Browse Source 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
This commit is contained in:
Thomas Daubney 2024-06-04 16:17:40 +01:00
parent b4914cfeb5
commit c7cb810c22
5 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mbedtls/mbedtls_config.h
View File

@ -354,7 +354,6 @@
//#define MBEDTLS_CAMELLIA_ALT //#define MBEDTLS_CAMELLIA_ALT
//#define MBEDTLS_CMAC_ALT //#define MBEDTLS_CMAC_ALT
//#define MBEDTLS_DES_ALT //#define MBEDTLS_DES_ALT
//#define MBEDTLS_GCM_ALT
//#define MBEDTLS_NIST_KW_ALT //#define MBEDTLS_NIST_KW_ALT
//#define MBEDTLS_MD5_ALT //#define MBEDTLS_MD5_ALT
//#define MBEDTLS_RIPEMD160_ALT //#define MBEDTLS_RIPEMD160_ALT

16
tests/include/alt-dummy/gcm_alt.h
View File

@ -1,16 +0,0 @@
/* gcm_alt.h with dummy types for MBEDTLS_GCM_ALT */
/*
* Copyright The Mbed TLS Contributors
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#ifndef GCM_ALT_H
#define GCM_ALT_H
typedef struct mbedtls_gcm_context {
int dummy;
}
mbedtls_gcm_context;
#endif /* gcm_alt.h */

3
tests/include/test/psa_crypto_helpers.h
View File

@ -293,8 +293,7 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string);
* \param alg The AEAD algorithm. * \param alg The AEAD algorithm.
* \param nonce_length The nonce length in number of bytes. * \param nonce_length The nonce length in number of bytes.
*/ */
#if defined(MBEDTLS_GCM_ALT) || \ #if defined(MBEDTLS_PSA_ACCEL_ALG_GCM)
defined(MBEDTLS_PSA_ACCEL_ALG_GCM)
#define MBEDTLS_TEST_HAVE_ALT_GCM 1 #define MBEDTLS_TEST_HAVE_ALT_GCM 1
#else #else
#define MBEDTLS_TEST_HAVE_ALT_GCM 0 #define MBEDTLS_TEST_HAVE_ALT_GCM 0

6
tf-psa-crypto/drivers/builtin/include/mbedtls/gcm.h
View File

@ -44,8 +44,6 @@
extern "C" { extern "C" {
#endif #endif
#if !defined(MBEDTLS_GCM_ALT)
#if defined(MBEDTLS_GCM_LARGE_TABLE) #if defined(MBEDTLS_GCM_LARGE_TABLE)
#define MBEDTLS_GCM_HTABLE_SIZE 256 #define MBEDTLS_GCM_HTABLE_SIZE 256
#else #else
@ -74,10 +72,6 @@ typedef struct mbedtls_gcm_context {
} }
mbedtls_gcm_context; mbedtls_gcm_context;
#else /* !MBEDTLS_GCM_ALT */
#include "gcm_alt.h"
#endif /* !MBEDTLS_GCM_ALT */
/** /**
* \brief This function initializes the specified GCM context, * \brief This function initializes the specified GCM context,
* to make references valid, and prepares the context * to make references valid, and prepares the context

16
tf-psa-crypto/drivers/builtin/src/gcm.c
View File

@ -39,8 +39,6 @@
#include "aesce.h" #include "aesce.h"
#endif #endif
#if !defined(MBEDTLS_GCM_ALT)
/* Used to select the acceleration mechanism */ /* Used to select the acceleration mechanism */
#define MBEDTLS_GCM_ACC_SMALLTABLE 0 #define MBEDTLS_GCM_ACC_SMALLTABLE 0
#define MBEDTLS_GCM_ACC_LARGETABLE 1 #define MBEDTLS_GCM_ACC_LARGETABLE 1
@ -780,8 +778,6 @@ void mbedtls_gcm_free(mbedtls_gcm_context *ctx)
mbedtls_platform_zeroize(ctx, sizeof(mbedtls_gcm_context)); mbedtls_platform_zeroize(ctx, sizeof(mbedtls_gcm_context));
} }
#endif /* !MBEDTLS_GCM_ALT */
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_CCM_GCM_CAN_AES) #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_CCM_GCM_CAN_AES)
/* /*
* AES-GCM test vectors from: * AES-GCM test vectors from:
@ -1024,9 +1020,6 @@ int mbedtls_gcm_self_test(int verbose)
size_t olen; size_t olen;
if (verbose != 0) { if (verbose != 0) {
#if defined(MBEDTLS_GCM_ALT)
mbedtls_printf(" GCM note: alternative implementation.\n");
#else /* MBEDTLS_GCM_ALT */
#if defined(MBEDTLS_AESNI_HAVE_CODE) #if defined(MBEDTLS_AESNI_HAVE_CODE)
if (mbedtls_aesni_has_support(MBEDTLS_AESNI_CLMUL)) { if (mbedtls_aesni_has_support(MBEDTLS_AESNI_CLMUL)) {
mbedtls_printf(" GCM note: using AESNI.\n"); mbedtls_printf(" GCM note: using AESNI.\n");
@ -1040,7 +1033,6 @@ int mbedtls_gcm_self_test(int verbose)
#endif #endif
mbedtls_printf(" GCM note: built-in implementation.\n"); mbedtls_printf(" GCM note: built-in implementation.\n");
#endif /* MBEDTLS_GCM_ALT */
} }
static const int loop_limit = static const int loop_limit =
@ -1080,14 +1072,6 @@ int mbedtls_gcm_self_test(int verbose)
add_len_test_data[i], add_len_test_data[i],
pt_test_data[pt_index_test_data[i]], pt_test_data[pt_index_test_data[i]],
buf, 16, tag_buf); buf, 16, tag_buf);
#if defined(MBEDTLS_GCM_ALT)
/* Allow alternative implementations to only support 12-byte nonces. */
if (ret == MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED &&
iv_len_test_data[i] != 12) {
mbedtls_printf("skipped\n");
break;
}
#endif /* defined(MBEDTLS_GCM_ALT) */
if (ret != 0) { if (ret != 0) {
goto exit; goto exit;
} }