From a37930a5badda86a2ca6be3bac88811a796b5e7e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 11 Feb 2014 14:59:16 +0100 Subject: [PATCH] busybox: ensure SHA passwords are supported if used As reported on IRC, our default busybox configuration doesn't support SHA encoded passwords, breaking login if enabled under system configuration. Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 948f3e42d..2a8e61646 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -75,6 +75,13 @@ define BUSYBOX_SET_MDEV endef endif +# sha passwords need USE_BB_CRYPT_SHA +ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256)$(BR2_TARGET_GENERIC_PASSWD_SHA512),y) +define BUSYBOX_SET_CRYPT_SHA + $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT_SHA,$(BUSYBOX_BUILD_CONFIG)) +endef +endif + ifeq ($(BR2_USE_MMU),y) define BUSYBOX_SET_MMU $(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) @@ -182,6 +189,7 @@ define BUSYBOX_CONFIGURE_CMDS $(BUSYBOX_SET_IPV6) $(BUSYBOX_PREFER_STATIC) $(BUSYBOX_SET_MDEV) + $(BUSYBOX_SET_CRYPT_SHA) $(BUSYBOX_NETKITBASE) $(BUSYBOX_NETKITTELNET) $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)