yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replaced MBEDTLS_GCM_LARGETABLE by MBEDTLS_GCM_LARGE_TABLE. Removed empty comment line in doc block.

Browse source 
Signed-off-by: Matthias Schulz <mschulz@hilscher.com>
This commit is contained in:
Matthias Schulz 2024-02-09 17:09:42 +01:00
parent 10902c5640
commit a6ac0f1330
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mbedtls/gcm.h
View file

@ -46,7 +46,7 @@ extern "C" {
#if !defined(MBEDTLS_GCM_ALT) #if !defined(MBEDTLS_GCM_ALT)
#if defined(MBEDTLS_GCM_LARGETABLE) #if defined(MBEDTLS_GCM_LARGE_TABLE)
#define MBEDTLS_GCM_HTABLE_SIZE 256 #define MBEDTLS_GCM_HTABLE_SIZE 256
#else #else
#define MBEDTLS_GCM_HTABLE_SIZE 16 #define MBEDTLS_GCM_HTABLE_SIZE 16

5
include/mbedtls/mbedtls_config.h
View file

@ -2801,7 +2801,7 @@
#define MBEDTLS_GCM_C #define MBEDTLS_GCM_C
/** /**
* \def MBEDTLS_GCM_LARGETABLE * \def MBEDTLS_GCM_LARGE_TABLE
* *
* Enable large pre-computed tables for Galois/Counter Mode (GCM). * Enable large pre-computed tables for Galois/Counter Mode (GCM).
* Can significantly increase throughput on systems without GCM hardware * Can significantly increase throughput on systems without GCM hardware
@ -2813,9 +2813,8 @@
* Module: library/gcm.c * Module: library/gcm.c
* *
* Requires: MBEDTLS_GCM_C * Requires: MBEDTLS_GCM_C
*
*/ */
//#define MBEDTLS_GCM_LARGETABLE //#define MBEDTLS_GCM_LARGE_TABLE
/** /**
* \def MBEDTLS_HKDF_C * \def MBEDTLS_HKDF_C

8
library/gcm.c
View file

@ -57,7 +57,7 @@ void mbedtls_gcm_init(mbedtls_gcm_context *ctx)
static inline void gcm_set_acceleration(mbedtls_gcm_context *ctx) static inline void gcm_set_acceleration(mbedtls_gcm_context *ctx)
{ {
#if defined(MBEDTLS_GCM_LARGETABLE) #if defined(MBEDTLS_GCM_LARGE_TABLE)
ctx->acceleration = MBEDTLS_GCM_ACC_LARGETABLE; ctx->acceleration = MBEDTLS_GCM_ACC_LARGETABLE;
#else #else
ctx->acceleration = MBEDTLS_GCM_ACC_SMALLTABLE; ctx->acceleration = MBEDTLS_GCM_ACC_SMALLTABLE;
@ -138,7 +138,7 @@ static int gcm_gen_table(mbedtls_gcm_context *ctx)
gcm_gen_table_rightshift(ctx->H[i], ctx->H[i*2]); gcm_gen_table_rightshift(ctx->H[i], ctx->H[i*2]);
} }
#if !defined(MBEDTLS_GCM_LARGETABLE) #if !defined(MBEDTLS_GCM_LARGE_TABLE)
/* pack elements of H as 64-bits ints, big-endian */ /* pack elements of H as 64-bits ints, big-endian */
for (i = MBEDTLS_GCM_HTABLE_SIZE/2; i > 0; i >>= 1) { for (i = MBEDTLS_GCM_HTABLE_SIZE/2; i > 0; i >>= 1) {
MBEDTLS_PUT_UINT64_BE(ctx->H[i][0], &ctx->H[i][0], 0); MBEDTLS_PUT_UINT64_BE(ctx->H[i][0], &ctx->H[i][0], 0);
@ -212,7 +212,7 @@ int mbedtls_gcm_setkey(mbedtls_gcm_context *ctx,
return 0; return 0;
} }
#if defined(MBEDTLS_GCM_LARGETABLE) #if defined(MBEDTLS_GCM_LARGE_TABLE)
static const uint16_t last8[256] = { static const uint16_t last8[256] = {
0x0000, 0xc201, 0x8403, 0x4602, 0x0807, 0xca06, 0x8c04, 0x4e05, 0x0000, 0xc201, 0x8403, 0x4602, 0x0807, 0xca06, 0x8c04, 0x4e05,
0x100e, 0xd20f, 0x940d, 0x560c, 0x1809, 0xda08, 0x9c0a, 0x5e0b, 0x100e, 0xd20f, 0x940d, 0x560c, 0x1809, 0xda08, 0x9c0a, 0x5e0b,
@ -360,7 +360,7 @@ static void gcm_mult(mbedtls_gcm_context *ctx, const unsigned char x[16],
break; break;
#endif #endif
#if defined(MBEDTLS_GCM_LARGETABLE) #if defined(MBEDTLS_GCM_LARGE_TABLE)
case MBEDTLS_GCM_ACC_LARGETABLE: case MBEDTLS_GCM_ACC_LARGETABLE:
gcm_mult_largetable(output, x, ctx->H); gcm_mult_largetable(output, x, ctx->H);
break; break;

6
tests/scripts/all.sh
View file

@ -4942,15 +4942,15 @@ component_test_aes_only_128_bit_keys_have_builtins () {
} }
component_test_gcm_largetable () { component_test_gcm_largetable () {
msg "build: default config + GCM_LARGETABLE - AESNI_C - AESCE_C" msg "build: default config + GCM_LARGE_TABLE - AESNI_C - AESCE_C"
scripts/config.py set MBEDTLS_GCM_LARGETABLE scripts/config.py set MBEDTLS_GCM_LARGE_TABLE
scripts/config.py unset MBEDTLS_PADLOCK_C scripts/config.py unset MBEDTLS_PADLOCK_C
scripts/config.py unset MBEDTLS_AESNI_C scripts/config.py unset MBEDTLS_AESNI_C
scripts/config.py unset MBEDTLS_AESCE_C scripts/config.py unset MBEDTLS_AESCE_C
make CFLAGS='-O2 -Werror -Wall -Wextra' make CFLAGS='-O2 -Werror -Wall -Wextra'
msg "test: default config - GCM_LARGETABLE - AESNI_C - AESCE_C" msg "test: default config - GCM_LARGE_TABLE - AESNI_C - AESCE_C"
make test make test
} }