From 6a5efbdbdd579595adda4f897f42aca533db99dc Mon Sep 17 00:00:00 2001 From: Matias Barcenas Date: Wed, 17 Jan 2018 23:22:03 -0600 Subject: [PATCH] Added detection support for WPA-TKIP. --- lib/HashUtils.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/HashUtils.sh b/lib/HashUtils.sh index bfd9b2a..cb12671 100755 --- a/lib/HashUtils.sh +++ b/lib/HashUtils.sh @@ -11,7 +11,11 @@ function hash_check_handshake() { local -r handshakeAPSSID=$3 local -r handshakeAPMAC=$4 - echo "Verifier Parameters: $handshakeVerifier, path $handshakePath, SSID \"$handshakeAPSSID\", MAC $handshakeAPMAC" > $HashOutputDevice + echo "Verifier Parameters: " > $HashOutputDevice + echo " Verifier: $handshakeVerifier" > $HashOutputDevice + echo "Hash Path: $handshakePath" > $HashOutputDevice + echo "Hash SSID: \"$handshakeAPSSID\"" > $HashOutputDevice + echo " Hash MAC: $handshakeAPMAC" > $HashOutputDevice local analysis # Since it's being used in all relevant instances. @@ -27,7 +31,7 @@ function hash_check_handshake() { if [ "$hashMeta" ]; then local hashID=$(echo "$hashMeta" | awk -F'[ #:]' '{print $3}') - local hashData=$(echo "${analysis[@]}" | awk "\$0~/#$hashID: HMAC_SHA[0-9]+_AES/{ print \$0 }") + local hashData=$(echo "${analysis[@]}" | awk "\$0~/#$hashID: HMAC_(SHA[0-9]+_AES|MD5_RC4)/{ print \$0 }") else echo "No valid hash meta was found for \"$handshakeAPSSID\"" > $HashOutputDevice fi