From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 16 Dec 2009 01:28:50 +0000 (+0100)
Subject: httpd -m: output salted MD5 hash. By (forrest AT hifulltech.com)
X-Git-Tag: 1_16_0~135
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dbc6a7a8fd33c79037c7f2894c24f271b714e3bc;p=oweals%2Fbusybox.git

httpd -m: output salted MD5 hash. By (forrest AT hifulltech.com)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/httpd.c b/networking/httpd.c
index 7ac43619a..0a8322c88 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2347,7 +2347,12 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
 #endif
 #if ENABLE_FEATURE_HTTPD_AUTH_MD5
 	if (opt & OPT_MD5) {
-		puts(pw_encrypt(pass, "$1$", 1));
+		char salt[sizeof("$1$XXXXXXXX")];
+		salt[0] = '$';
+		salt[1] = '1';
+		salt[2] = '$';
+		crypt_make_salt(salt + 3, 4, 0);
+		puts(pw_encrypt(pass, salt, 1));
 		return 0;
 	}
 #endif