From 6dbb9aabf85d032e1491ee56fc4c6f915f584fd5 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 a2d877841..316c30129 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 822b834bdf4a7fdd5c5189f781141630af52484a 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8f0e8c1c7..00298a214 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ mbed TLS ChangeLog (Sorted per branch, date) += mbed TLS x.xx.x branch released xxxx-xx-xx + +Bugfix + * Run the AD too long test only if MBEDTLS_CCM_ALT is not defined. + Raised as a comment in #1996. + = mbed TLS 2.14.0 branch released 2018-11-19 Security