From 4cd013a3347cda7969cf7adabfb0233087148024 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 5 Nov 2022 17:55:24 +0100 Subject: [PATCH] package/libopenssl: fix enabling/disabling mdc2 Commit 3dbc86f09897 (openssl: bump version, enable mdc2+camellia+tlsext) from 2010-06-03, forced the build of mdc2. Commit a83d41867c8d (package/libopenssl: add option to enable some features) added an option to explicitly disable mdc2, but forgot to amend the existing enabling option. It appears that, like most (all?) openssl config options, mdc2 ends up enabled unless explicitly disabled. Additionally, mdc2 depends on DES, so without DES, mdc2 gets disabled. So, drop the explicit enabling option, and make mdc2 select DES. Signed-off-by: Yann E. MORIN Cc: "GAUTRON, Erwan" Cc: "Weber, Matthew L Collins" Signed-off-by: Arnout Vandecappelle (cherry picked from commit 45bb69c2bdee44346d6be5b58e46b2278e40a04a) Signed-off-by: Peter Korsgaard --- package/libopenssl/Config.in | 1 + package/libopenssl/libopenssl.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 00339238fb..7a3f56a512 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -63,6 +63,7 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 config BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 bool "enable MDC2" default y + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES config BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 bool "enable BLAKE2" diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 3542b89727..fc22c20467 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -79,7 +79,6 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \ no-rc5 \ enable-camellia \ - enable-mdc2 \ no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \