From 44f6d0b3b137a13449d693b97d24d52a9d8e5183 Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Sun, 25 Nov 2018 10:31:53 +0200 Subject: [PATCH 1/2] Test AD too long only when CCM_ALT not defined Since the AD too long is a limitation on Mbed TLS, HW accelerators may support this. Run the test for AD too long, only if `MBEDTLS_CCM_ALT` is not defined. Addresses comment in #1996. --- tests/suites/test_suite_ccm.data | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/suites/test_suite_ccm.data b/tests/suites/test_suite_ccm.data index 90ba42d83..65dc38243 100644 --- a/tests/suites/test_suite_ccm.data +++ b/tests/suites/test_suite_ccm.data @@ -36,6 +36,7 @@ CCM lengths #6 tag length not even ccm_lengths:5:10:5:7:MBEDTLS_ERR_CCM_BAD_INPUT CCM lenghts #7 AD too long (2^16 - 2^8 + 1) +depends_on:!MBEDTLS_CCM_ALT ccm_lengths:5:10:65281:8:MBEDTLS_ERR_CCM_BAD_INPUT CCM lengths #8 msg too long for this IV length (2^16, q = 2) From 314bd71894d5e9c6aaff5de17634f23d68d6d44f Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Sun, 25 Nov 2018 10:38:34 +0200 Subject: [PATCH 2/2] Update ChangeLog Add an entry in ChangeLog describing the fix. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8eab14b61..daac9590e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ Bugfix * Add explicit integer to enumeration type casts to example program programs/pkey/gen_key which previously led to compilation failure on some toolchains. Reported by phoenixmcallister. Fixes #2170. + * Run the AD too long test only if MBEDTLS_CCM_ALT is not defined. + Raised as a comment in #1996. = mbed TLS 2.7.8 branch released 2018-11-30