commit 651ae684e11e856a094c9de895cab4edfbe70432
author Jaeden Amero <jaeden.amero@arm.com> Wed Apr 10 18:19:16 2019 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Thu Apr 25 11:46:21 2019 +0100
tree f29b2aa9472fd5acf95fa5dbe127be8c04fba3b0
parent 7accf444eaf29db01b7346bd2e90e3ec25f4c8fd

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

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 8f6ff5f..78bf131 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
 

include/mbedtls/config.h

diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 8577365..56ad01c 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.
  */