KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uhttpd: cope with DES crypted passwd entries by not relying on a leading dollar sign to indicate a cipher

Browse source 
SVN-Revision: 28886
This commit is contained in:
Jo-Philipp Wich 2011-11-09 18:55:28 +00:00
parent d9aa1e3c1b
commit 44da6400cd
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/uhttpd/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=29 PKG_RELEASE:=30
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \

7
package/uhttpd/src/uhttpd-utils.c
View file

@ -782,12 +782,9 @@ int uh_auth_check(
/* found a realm matching the username */ /* found a realm matching the username */
if( realm ) if( realm )
{ {
/* is a crypt passwd */
if( realm->pass[0] == '$' )
pass = crypt(pass, realm->pass);
/* check user pass */ /* check user pass */
if( !strcmp(pass, realm->pass) ) if (!strcmp(pass, realm->pass) ||
!strcmp(crypt(pass, realm->pass), realm->pass))
return 1; return 1;
} }
} }