Przeglądaj źródła

package.libopenssl: fix enabling/disabling mdc2

Commit 3dbc86f09897 (openssl: bump version, enable mdc2+camellia+tlsext)
form 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 <yann.morin.1998@free.fr>
Cc: "GAUTRON, Erwan" <erwan.gautron@bertin.fr>
Cc: "Weber, Matthew L Collins" <Matthew.Weber@collins.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit 45bb69c2bdee44346d6be5b58e46b2278e40a04a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yann E. MORIN 2 lat temu
rodzic
commit
33f30c4ce7
2 zmienionych plików z 1 dodań i 1 usunięć
  1. 1 0
      package/libopenssl/Config.in
  2. 0 1
      package/libopenssl/libopenssl.mk

+ 1 - 0
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"

+ 0 - 1
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 \