浏览代码

6in4: send password unhashed

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 <[email protected]>

SVN-Revision: 41358
Jo-Philipp Wich 11 年之前
父节点
当前提交
42bc2c49ae
共有 2 个文件被更改,包括 2 次插入6 次删除
  1. 1 1
      package/network/ipv6/6in4/Makefile
  2. 1 5
      package/network/ipv6/6in4/files/6in4.sh

+ 1 - 1
package/network/ipv6/6in4/Makefile

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

+ 1 - 5
package/network/ipv6/6in4/files/6in4.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # 6in4.sh - IPv6-in-IPv4 tunnel backend
-# Copyright (c) 2010-2012 OpenWrt.org
+# Copyright (c) 2010-2014 OpenWrt.org
 
 [ -n "$INCLUDE_ONLY" ] || {
 	. /lib/functions.sh
@@ -63,10 +63,6 @@ proto_6in4_setup() {
 	proto_send_update "$cfg"
 
 	[ -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"
 
 		local url="http://ipv4.tunnelbroker.net/nic/update?username=$username&password=$password&hostname=$tunnelid"