diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-12 16:56:52 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-12 16:56:52 +0000 |
commit | fdddab0c61c55c25d4218d4370e2b16a7936a794 (patch) | |
tree | bf93480018a52ab051189222248b6d04af98d7d4 /networking | |
parent | 4ea83bf562c44a6792e7c77e7d87cba91f86f763 (diff) | |
download | busybox-w32-fdddab0c61c55c25d4218d4370e2b16a7936a794.tar.gz busybox-w32-fdddab0c61c55c25d4218d4370e2b16a7936a794.tar.bz2 busybox-w32-fdddab0c61c55c25d4218d4370e2b16a7936a794.zip |
make pw_encrypt() return malloc'ed string.
text data bss dec hex filename
759802 604 6684 767090 bb472 busybox_old
759804 604 6676 767084 bb46c busybox_unstripped
Diffstat (limited to 'networking')
-rw-r--r-- | networking/httpd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 78c6f4d1d..352a97d3c 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1721,7 +1721,6 @@ static int checkPerm(const char *path, const char *request) | |||
1721 | } | 1721 | } |
1722 | 1722 | ||
1723 | if (ENABLE_FEATURE_HTTPD_AUTH_MD5) { | 1723 | if (ENABLE_FEATURE_HTTPD_AUTH_MD5) { |
1724 | char *cipher; | ||
1725 | char *pp; | 1724 | char *pp; |
1726 | 1725 | ||
1727 | if (strncmp(p, request, u - request) != 0) { | 1726 | if (strncmp(p, request, u - request) != 0) { |
@@ -1732,9 +1731,10 @@ static int checkPerm(const char *path, const char *request) | |||
1732 | if (pp && pp[1] == '$' && pp[2] == '1' | 1731 | if (pp && pp[1] == '$' && pp[2] == '1' |
1733 | && pp[3] == '$' && pp[4] | 1732 | && pp[3] == '$' && pp[4] |
1734 | ) { | 1733 | ) { |
1735 | pp++; | 1734 | char *encrypted = pw_encrypt(u+1, ++pp, 1); |
1736 | cipher = pw_encrypt(u+1, pp, 1); | 1735 | int r = strcmp(encrypted, pp); |
1737 | if (strcmp(cipher, pp) == 0) | 1736 | free(encrypted); |
1737 | if (r == 0) | ||
1738 | goto set_remoteuser_var; /* Ok */ | 1738 | goto set_remoteuser_var; /* Ok */ |
1739 | /* unauthorized */ | 1739 | /* unauthorized */ |
1740 | continue; | 1740 | continue; |