From 72b156d60b5ddbb795ba6325f9919cf516c783db Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 5 Nov 2022 17:55:23 +0100 Subject: [PATCH] package/libopenssl: drop useless option for rc5 Commit a83d41867c8d (package/libopenssl: add option to enable some features) added an option to enable rc5. However, since commit 1fff94121936 (Fixup non-x86 openssl build), dated 2002-12-30, rc5 has always been forcibly disabled in Buildroot. Given that it was unconditionally disabled all this time, and no one complained, it means there is virtually no-one using rc5, so we can just drop the option. Signed-off-by: Yann E. MORIN Cc: "GAUTRON, Erwan" Cc: "Weber, Matthew L Collins" Signed-off-by: Arnout Vandecappelle (cherry picked from commit d7178dd432e4905cf96383e5aa316553cf30f178) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/libopenssl/Config.in | 4 ---- package/libopenssl/libopenssl.mk | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index cfbe2921cc..8db70cae5a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 + bool "libopenssl rc5 was never enabled" + select BR2_LEGACY + help + The libopenssl option for rc5 never actually enabled rc5, + which had always been disabled in Buildroot. + config BR2_PACKAGE_PHP_EXT_WDDX bool "php wddx removed" select BR2_LEGACY diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index fcead4c11a..00339238fb 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -44,10 +44,6 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA bool "enable CHACHA" default y -config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 - bool "enable RC5" - default y - config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 bool "enable RC2" default y diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 50d41a6533..3542b89727 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -85,7 +85,6 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-afl \ no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ - $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5),,no-rc5) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2),,no-md2) \