mirror of https://github.com/hak5/openwrt.git
update busybox to v1.1.3, remove passwd_salt patch (fixed upstream).
SVN-Revision: 3794lede-17.01
parent
ba2c5cad00
commit
72fc91e142
|
@ -13,11 +13,11 @@ PKG_SOURCE:=$(PKG_NAME)-snapshot.tar.bz2
|
|||
PKG_SOURCE_URL:=http://www.busybox.net/downloads/snapshots
|
||||
PKG_MD5SUM:=x
|
||||
else
|
||||
PKG_VERSION:=1.1.2
|
||||
PKG_VERSION:=1.1.3
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=http://www.busybox.net/downloads
|
||||
PKG_MD5SUM:=0b5d78072302fe687407956537bdb9e3
|
||||
PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7
|
||||
endif
|
||||
PKG_CAT:=bzcat
|
||||
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
--- busybox-1.00/loginutils/passwd.c 2006-03-26 06:07:37 -05:00
|
||||
+++ busybox-1.00/loginutils/passwd.c 2006-03-26 06:09:03 -05:00
|
||||
@@ -386,7 +386,9 @@
|
||||
bzero(orig, sizeof(orig));
|
||||
|
||||
if (algo == 1) {
|
||||
- cp = pw_encrypt(pass, "$1$");
|
||||
+ char salt[6]="$1$\0\0\0";
|
||||
+ memcpy(salt+3,crypt_make_salt(),3);
|
||||
+ cp = pw_encrypt(pass, salt);
|
||||
} else
|
||||
cp = pw_encrypt(pass, crypt_make_salt());
|
||||
bzero(pass, sizeof pass);
|
Loading…
Reference in New Issue