[git commit master] httpd -m: output salted MD5 hash. By (forrest AT hifulltech.com)

Denys Vlasenko vda.linux at googlemail.com
Wed Dec 16 01:28:50 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=dbc6a7a8fd33c79037c7f2894c24f271b714e3bc
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/httpd.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/networking/httpd.c b/networking/httpd.c
index 7ac4361..0a8322c 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
-- 
1.6.3.3



More information about the busybox-cvs mailing list