Author: jow Date: 2014-06-27 12:40:44 +0200 (Fri, 27 Jun 2014) New Revision: 41358
Modified: trunk/package/network/ipv6/6in4/Makefile trunk/package/network/ipv6/6in4/files/6in4.sh Log: 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]> Modified: trunk/package/network/ipv6/6in4/Makefile =================================================================== --- trunk/package/network/ipv6/6in4/Makefile 2014-06-27 10:40:21 UTC (rev 41357) +++ trunk/package/network/ipv6/6in4/Makefile 2014-06-27 10:40:44 UTC (rev 41358) @@ -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 Modified: trunk/package/network/ipv6/6in4/files/6in4.sh =================================================================== --- trunk/package/network/ipv6/6in4/files/6in4.sh 2014-06-27 10:40:21 UTC (rev 41357) +++ trunk/package/network/ipv6/6in4/files/6in4.sh 2014-06-27 10:40:44 UTC (rev 41358) @@ -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_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"; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
