From acf19f2bd0524d734de19061487ac0c2d05a3bb8 Mon Sep 17 00:00:00 2001 From: Flavio Ceolin Date: Wed, 6 Nov 2024 16:09:25 -0800 Subject: [PATCH 1/2] Revert "tinycrypt: deprecate the library" This reverts commit 5e225e0c8b2fb1ceb290fe91170b0e2d5bc46259. Based on #79931 and TSC discussions, it was decided that TinyCrypt will be deprecated *AFTER* 4.0. Signed-off-by: Flavio Ceolin --- doc/releases/migration-guide-4.0.rst | 13 ------------- doc/releases/release-notes-4.0.rst | 10 ---------- modules/Kconfig.tinycrypt | 1 - 3 files changed, 24 deletions(-) diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst index 20e10f9a77bc0..358f92bbd857e 100644 --- a/doc/releases/migration-guide-4.0.rst +++ b/doc/releases/migration-guide-4.0.rst @@ -75,19 +75,6 @@ Mbed TLS corresponding build symbol was removed in Mbed TLS 3.1.0 and is now assumed to be enabled. (:github:`77657`) -TinyCrypt -========= - -* Starting from this release the library is marked as deprecated (:github:`79566`). - The reasons for this are (:github:`43712``): - - * the upstream version of this library is unmaintained. - - * to reduce the number of crypto libraries available in Zephyr (currently there are - 3 different implementations: TinyCrypt, MbedTLS and PSA Crypto APIs). - - The PSA Crypto API is now the de-facto standard to perform crypto operations. - Trusted Firmware-M ================== diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst index fd2fc682aa7db..88a5852ddf658 100644 --- a/doc/releases/release-notes-4.0.rst +++ b/doc/releases/release-notes-4.0.rst @@ -58,16 +58,6 @@ Deprecated in this release * The :ref:`kscan_api` subsystem has been marked as deprecated. -* The TinyCrypt library was marked as deprecated (:github:`79566`). The reasons - for this are (:github:`43712``): - - * the upstream version of this library is unmaintained. - - * to reduce the number of crypto libraries available in Zephyr (currently there are - 3 different implementations: TinyCrypt, MbedTLS and PSA Crypto APIs). - - The PSA Crypto API is now the de-facto standard to perform crypto operations. - Architectures ************* diff --git a/modules/Kconfig.tinycrypt b/modules/Kconfig.tinycrypt index b54ad7641285e..168e05ed79980 100644 --- a/modules/Kconfig.tinycrypt +++ b/modules/Kconfig.tinycrypt @@ -9,7 +9,6 @@ config ZEPHYR_TINYCRYPT_MODULE config TINYCRYPT bool "TinyCrypt Support" depends on ZEPHYR_TINYCRYPT_MODULE - select DEPRECATED help This option enables the TinyCrypt cryptography library. From ceabf44ca8407d3e87a5723e2ad559640b15ba9a Mon Sep 17 00:00:00 2001 From: Flavio Ceolin Date: Fri, 8 Nov 2024 09:46:52 -0800 Subject: [PATCH 2/2] docs: release/4.0: Info about TinyCrypt Add an information about upcoming TinyCrypt deprecation. Signed-off-by: Flavio Ceolin --- doc/releases/migration-guide-4.0.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst index 358f92bbd857e..4ab7f154b20f9 100644 --- a/doc/releases/migration-guide-4.0.rst +++ b/doc/releases/migration-guide-4.0.rst @@ -75,6 +75,12 @@ Mbed TLS corresponding build symbol was removed in Mbed TLS 3.1.0 and is now assumed to be enabled. (:github:`77657`) +TinyCrypt +========= + +Albeit the formal deprecation of TinyCrypt is not started yet, its removal from +the Zephyr codebase is. Formal deprecation will happen in the next release. + Trusted Firmware-M ==================