mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-17 20:42:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove MBEDTLS_CHACHA20_ALT

Browse Source 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
This commit is contained in:
Thomas Daubney 2024-06-05 12:44:31 +01:00
parent af28a17bb6
commit f60ff02cf3
4 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mbedtls/mbedtls_config.h
View File

@ -379,7 +379,6 @@
//#define MBEDTLS_ARIA_ALT //#define MBEDTLS_ARIA_ALT
//#define MBEDTLS_CAMELLIA_ALT //#define MBEDTLS_CAMELLIA_ALT
//#define MBEDTLS_CCM_ALT //#define MBEDTLS_CCM_ALT
//#define MBEDTLS_CHACHA20_ALT
//#define MBEDTLS_CMAC_ALT //#define MBEDTLS_CMAC_ALT
//#define MBEDTLS_DES_ALT //#define MBEDTLS_DES_ALT
//#define MBEDTLS_GCM_ALT //#define MBEDTLS_GCM_ALT

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

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

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

@ -33,8 +33,6 @@
extern "C" { extern "C" {
#endif #endif
#if !defined(MBEDTLS_CHACHA20_ALT)
typedef struct mbedtls_chacha20_context { typedef struct mbedtls_chacha20_context {
uint32_t MBEDTLS_PRIVATE(state)[16]; /*! The state (before round operations). */ uint32_t MBEDTLS_PRIVATE(state)[16]; /*! The state (before round operations). */
uint8_t MBEDTLS_PRIVATE(keystream8)[64]; /*! Leftover keystream bytes. */ uint8_t MBEDTLS_PRIVATE(keystream8)[64]; /*! Leftover keystream bytes. */
@ -42,10 +40,6 @@ typedef struct mbedtls_chacha20_context {
} }
mbedtls_chacha20_context; mbedtls_chacha20_context;
#else /* MBEDTLS_CHACHA20_ALT */
#include "chacha20_alt.h"
#endif /* MBEDTLS_CHACHA20_ALT */
/** /**
* \brief This function initializes the specified ChaCha20 context. * \brief This function initializes the specified ChaCha20 context.
* *

4
tf-psa-crypto/drivers/builtin/src/chacha20.c
View File

@ -22,8 +22,6 @@
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#if !defined(MBEDTLS_CHACHA20_ALT)
#define ROTL32(value, amount) \ #define ROTL32(value, amount) \
((uint32_t) ((value) << (amount)) | ((value) >> (32 - (amount)))) ((uint32_t) ((value) << (amount)) | ((value) >> (32 - (amount))))
@ -271,8 +269,6 @@ cleanup:
return ret; return ret;
} }
#endif /* !MBEDTLS_CHACHA20_ALT */
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)
static const unsigned char test_keys[2][32] = static const unsigned char test_keys[2][32] =