From f059e74a22cba36ed1ea93754c0be4da8b211b96 Mon Sep 17 00:00:00 2001 From: TRodziewicz Date: Tue, 1 Jun 2021 11:17:07 +0200 Subject: [PATCH] Re-wording ChangeLog and reverting overzealous removal from config.h Signed-off-by: TRodziewicz --- ChangeLog.d/issue4367.txt | 7 ++++--- include/mbedtls/config.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog.d/issue4367.txt b/ChangeLog.d/issue4367.txt index 8c31d719d4..9012fc062c 100644 --- a/ChangeLog.d/issue4367.txt +++ b/ChangeLog.d/issue4367.txt @@ -1,6 +1,5 @@ Removals - * Remove the MBEDTLS_REMOVE_3DES_CIPHERSUITES config.h option and makke as if - it was disabled. Remove all the 3DES ciphersuites: + * Remove all the 3DES ciphersuites: MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA, MBEDTLS_TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, MBEDTLS_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, @@ -9,4 +8,6 @@ Removals MBEDTLS_TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, MBEDTLS_TLS_PSK_WITH_3DES_EDE_CBC_SHA, MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA, - MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA . Fixes #4367. + MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA. Remove the + MBEDTLS_REMOVE_3DES_CIPHERSUITES option which is no longer relevant. + Fixes #4367. diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 12f8c95cef..3aa0877c5b 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -2340,7 +2340,7 @@ * \note When #MBEDTLS_CMAC_ALT is active, meaning that the underlying * implementation of the CMAC algorithm is provided by an alternate * implementation, that alternate implementation may opt to not support - * AES-192 as underlying block ciphers for the CMAC operation. + * AES-192 or 3DES as underlying block ciphers for the CMAC operation. * * Module: library/cmac.c *