From 651ae684e11e856a094c9de895cab4edfbe70432 Mon Sep 17 00:00:00 2001 From: Jaeden Amero Date: Wed, 10 Apr 2019 18:19:16 +0100 Subject: [PATCH] config: Enable using ARIA-GCM without other ciphers Previously, GCM required enabling either AES or Camellia. However, we also support using GCM with ARIA and without other ciphers. Enable configurations with only ARIA enabled to use GCM. --- include/mbedtls/check_config.h | 2 +- include/mbedtls/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h index 8f6ff5f8e..78bf131e0 100644 --- a/include/mbedtls/check_config.h +++ b/include/mbedtls/check_config.h @@ -177,7 +177,7 @@ #endif #if defined(MBEDTLS_GCM_C) && ( \ - !defined(MBEDTLS_AES_C) && !defined(MBEDTLS_CAMELLIA_C) ) + !defined(MBEDTLS_AES_C) && !defined(MBEDTLS_CAMELLIA_C) && !defined(MBEDTLS_ARIA_C) ) #error "MBEDTLS_GCM_C defined, but not all prerequisites" #endif diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 85773653b..56ad01c40 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -1386,7 +1386,7 @@ * * Module: library/gcm.c * - * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C + * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C or MBEDTLS_ARIA_C * * This module is required to support the TLS ciphersuites that use GCM. */