mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-29 22:20:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9268 from tom-daubney-arm/remove_symmetric_crypto_alt_interface

Browse Source 
Remove symmetric crypto alt interface
This commit is contained in:
Bence Szépkúti 2024-07-12 13:27:04 +00:00 committed by GitHub
commit 3f2d9b6a4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 0 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbedtls/mbedtls_config.h
View File

@ -379,14 +379,11 @@
//#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_CHACHAPOLY_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
//#define MBEDTLS_NIST_KW_ALT //#define MBEDTLS_NIST_KW_ALT
//#define MBEDTLS_MD5_ALT //#define MBEDTLS_MD5_ALT
//#define MBEDTLS_POLY1305_ALT
//#define MBEDTLS_RIPEMD160_ALT //#define MBEDTLS_RIPEMD160_ALT
//#define MBEDTLS_SHA1_ALT //#define MBEDTLS_SHA1_ALT
//#define MBEDTLS_SHA256_ALT //#define MBEDTLS_SHA256_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 */

18
tests/include/alt-dummy/chachapoly_alt.h
View File

@ -1,18 +0,0 @@
/* chachapoly_alt.h with dummy types for MBEDTLS_CHACHAPOLY_ALT */
/*
* Copyright The Mbed TLS Contributors
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#ifndef CHACHAPOLY_ALT_H
#define CHACHAPOLY_ALT_H
#include "mbedtls/chacha20.h"
typedef struct mbedtls_chachapoly_context {
int dummy;
}
mbedtls_chachapoly_context;
#endif /* chachapoly_alt.h */

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

@ -1,16 +0,0 @@
/* poly1305_alt.h with dummy types for MBEDTLS_POLY1305_ALT */
/*
* Copyright The Mbed TLS Contributors
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
*/
#ifndef POLY1305_ALT_H
#define POLY1305_ALT_H
typedef struct mbedtls_poly1305_context {
int dummy;
}
mbedtls_poly1305_context;
#endif /* poly1305_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.
* *

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

@ -41,8 +41,6 @@ typedef enum {
} }
mbedtls_chachapoly_mode_t; mbedtls_chachapoly_mode_t;
#if !defined(MBEDTLS_CHACHAPOLY_ALT)
#include "mbedtls/chacha20.h" #include "mbedtls/chacha20.h"
typedef struct mbedtls_chachapoly_context { typedef struct mbedtls_chachapoly_context {
@ -55,10 +53,6 @@ typedef struct mbedtls_chachapoly_context {
} }
mbedtls_chachapoly_context; mbedtls_chachapoly_context;
#else /* !MBEDTLS_CHACHAPOLY_ALT */
#include "chachapoly_alt.h"
#endif /* !MBEDTLS_CHACHAPOLY_ALT */
/** /**
* \brief This function initializes the specified ChaCha20-Poly1305 context. * \brief This function initializes the specified ChaCha20-Poly1305 context.
* *

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

@ -33,8 +33,6 @@
extern "C" { extern "C" {
#endif #endif
#if !defined(MBEDTLS_POLY1305_ALT)
typedef struct mbedtls_poly1305_context { typedef struct mbedtls_poly1305_context {
uint32_t MBEDTLS_PRIVATE(r)[4]; /** The value for 'r' (low 128 bits of the key). */ uint32_t MBEDTLS_PRIVATE(r)[4]; /** The value for 'r' (low 128 bits of the key). */
uint32_t MBEDTLS_PRIVATE(s)[4]; /** The value for 's' (high 128 bits of the key). */ uint32_t MBEDTLS_PRIVATE(s)[4]; /** The value for 's' (high 128 bits of the key). */
@ -44,10 +42,6 @@ typedef struct mbedtls_poly1305_context {
} }
mbedtls_poly1305_context; mbedtls_poly1305_context;
#else /* MBEDTLS_POLY1305_ALT */
#include "poly1305_alt.h"
#endif /* MBEDTLS_POLY1305_ALT */
/** /**
* \brief This function initializes the specified Poly1305 context. * \brief This function initializes the specified Poly1305 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] =

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

@ -19,8 +19,6 @@
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#if !defined(MBEDTLS_CHACHAPOLY_ALT)
#define CHACHAPOLY_STATE_INIT (0) #define CHACHAPOLY_STATE_INIT (0)
#define CHACHAPOLY_STATE_AAD (1) #define CHACHAPOLY_STATE_AAD (1)
#define CHACHAPOLY_STATE_CIPHERTEXT (2) /* Encrypting or decrypting */ #define CHACHAPOLY_STATE_CIPHERTEXT (2) /* Encrypting or decrypting */
@ -318,8 +316,6 @@ int mbedtls_chachapoly_auth_decrypt(mbedtls_chachapoly_context *ctx,
return 0; return 0;
} }
#endif /* MBEDTLS_CHACHAPOLY_ALT */
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)
static const unsigned char test_key[1][32] = static const unsigned char test_key[1][32] =

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

@ -18,8 +18,6 @@
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#if !defined(MBEDTLS_POLY1305_ALT)
#define POLY1305_BLOCK_SIZE_BYTES (16U) #define POLY1305_BLOCK_SIZE_BYTES (16U)
/* /*
@ -373,8 +371,6 @@ cleanup:
return ret; return ret;
} }
#endif /* MBEDTLS_POLY1305_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] =