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_CHACHAPOLY_ALT

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

1
include/mbedtls/mbedtls_config.h
View File

@ -380,7 +380,6 @@
//#define MBEDTLS_CAMELLIA_ALT //#define MBEDTLS_CAMELLIA_ALT
//#define MBEDTLS_CCM_ALT //#define MBEDTLS_CCM_ALT
//#define MBEDTLS_CHACHA20_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

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 */

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.
* *

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] =