blob: f90c840bafbf5cdcb2a53603a195b0eac02b65ad (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
Copyright (C) 2006 OpenWrt.org
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1713,21 +1713,32 @@ static int check_user_passwd(const char
if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
char *md5_passwd;
+ int user_len_p1;
md5_passwd = strchr(cur->after_colon, ':');
- if (md5_passwd && md5_passwd[1] == '$' && md5_passwd[2] == '1'
+ user_len_p1 = md5_passwd + 1 - cur->after_colon;
+ if (md5_passwd && !strncmp(md5_passwd + 1, "$p$", 3)) {
+ struct passwd *pwd = NULL;
+
+ pwd = getpwnam(&md5_passwd[4]);
+ if(!pwd->pw_passwd || !pwd->pw_passwd[0] || pwd->pw_passwd[0] == '!')
+ return 1;
+
+ md5_passwd = pwd->pw_passwd;
+ goto check_md5_pw;
+ } else if (md5_passwd && md5_passwd[1] == '$' && md5_passwd[2] == '1'
&& md5_passwd[3] == '$' && md5_passwd[4]
) {
char *encrypted;
- int r, user_len_p1;
+ int r;
md5_passwd++;
- user_len_p1 = md5_passwd - cur->after_colon;
/* comparing "user:" */
if (strncmp(cur->after_colon, user_and_passwd, user_len_p1) != 0) {
continue;
}
+check_md5_pw:
encrypted = pw_encrypt(
user_and_passwd + user_len_p1 /* cleartext pwd from user */,
md5_passwd /*salt */, 1 /* cleanup */);
|
