From 2268b967cbbe7f8fd8fb555d5cbe8fc64a35a254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?=
 <manuel.pegourie-gonnard@arm.com>
Date: Tue, 27 Feb 2018 12:22:36 +0100
Subject: [PATCH] aria: disable by default in config.h

---
 include/mbedtls/config.h | 5 +++--
 tests/compat.sh          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index ed69f14b17..e342e4ce90 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -1806,11 +1806,12 @@
 /**
  * \def MBEDTLS_ARIA_C
  *
- * Enable the ARIA block cipher.
+ * Enable the ARIA block cipher (and TLS ciphersuites that use it, if other
+ * requirements for them are met too).
  *
  * Module:  library/aria.c
  */
-#define MBEDTLS_ARIA_C
+//#define MBEDTLS_ARIA_C
 
 /**
  * \def MBEDTLS_CCM_C
diff --git a/tests/compat.sh b/tests/compat.sh
index 93e6b3a6d6..0a863fa487 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -57,7 +57,7 @@ FILTER=""
 # - NULL: excluded from our default config
 # - RC4, single-DES: requires legacy OpenSSL/GnuTLS versions
 #   avoid plain DES but keep 3DES-EDE-CBC (mbedTLS), DES-CBC3 (OpenSSL)
-# - ARIA: requires OpenSSL >= 1.1.1
+# - ARIA: not in default config.h + requires OpenSSL >= 1.1.1
 EXCLUDE='NULL\|DES-CBC-\|RC4\|ARCFOUR\|ARIA'
 VERBOSE=""
 MEMCHECK=0