summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-09 18:55:28 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-11-09 18:55:28 +0000
commit44da6400cde94d6b3cb7581cf474282ea1bcafd3 (patch)
tree18c345fbf988ba21ec3517038ceb28f7b6ea2209
parentd9aa1e3c1b3d849153caf2a32ceaaf04f10ecc71 (diff)
downloadmtk-20170518-44da6400cde94d6b3cb7581cf474282ea1bcafd3.zip
mtk-20170518-44da6400cde94d6b3cb7581cf474282ea1bcafd3.tar.gz
mtk-20170518-44da6400cde94d6b3cb7581cf474282ea1bcafd3.tar.bz2
uhttpd: cope with DES crypted passwd entries by not relying on a leading dollar sign to indicate a cipher
SVN-Revision: 28886
-rw-r--r--package/uhttpd/Makefile2
-rw-r--r--package/uhttpd/src/uhttpd-utils.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index d8bd33c..c333660 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
-PKG_RELEASE:=29
+PKG_RELEASE:=30
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \
diff --git a/package/uhttpd/src/uhttpd-utils.c b/package/uhttpd/src/uhttpd-utils.c
index d48f6bc..a47f175 100644
--- a/package/uhttpd/src/uhttpd-utils.c
+++ b/package/uhttpd/src/uhttpd-utils.c
@@ -782,12 +782,9 @@ int uh_auth_check(
/* found a realm matching the username */
if( realm )
{
- /* is a crypt passwd */
- if( realm->pass[0] == '$' )
- pass = crypt(pass, realm->pass);
-
/* check user pass */
- if( !strcmp(pass, realm->pass) )
+ if (!strcmp(pass, realm->pass) ||
+ !strcmp(crypt(pass, realm->pass), realm->pass))
return 1;
}
}