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

6in4: send password unhashed

Browse source 
The preferred he.net /nic/update endpoint expects the password or updatekey in
plain text and not as md5 sum, therfore remove the hashing operation from the
script.

This effectively renders the "updatekey" option redundant but we keep it around
for backwards compatibility. Both "option password" and "option updatekey" will
have end up in the "&password=" parameter of the update url and are passed through
unmodified.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 41358
This commit is contained in:
Jo-Philipp Wich 2014-06-27 10:40:44 +00:00
parent 4255b2fde5
commit 42bc2c49ae
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/ipv6/6in4/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=16 PKG_VERSION:=17
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

6
package/network/ipv6/6in4/files/6in4.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# 6in4.sh - IPv6-in-IPv4 tunnel backend # 6in4.sh - IPv6-in-IPv4 tunnel backend
# Copyright (c) 2010-2012 OpenWrt.org # Copyright (c) 2010-2014 OpenWrt.org
[ -n "$INCLUDE_ONLY" ] || { [ -n "$INCLUDE_ONLY" ] || {
. /lib/functions.sh . /lib/functions.sh
@ -63,10 +63,6 @@ proto_6in4_setup() {
proto_send_update "$cfg" proto_send_update "$cfg"
[ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && { [ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && {
[ "${#password}" == 32 -a -z "${password//[a-fA-F0-9]/}" ] || {
password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
}
[ -n "$updatekey" ] && password="$updatekey" [ -n "$updatekey" ] && password="$updatekey"
local url="http://ipv4.tunnelbroker.net/nic/update?username=$username&password=$password&hostname=$tunnelid" local url="http://ipv4.tunnelbroker.net/nic/update?username=$username&password=$password&hostname=$tunnelid"