Mirrors
/
fluxion
mirror of https://github.com/FluxionNetwork/fluxion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bad translation, add ui for handshake

This commit is contained in:
deltaxflux 2017-09-10 13:20:08 +02:00
parent 406e8c8c27
commit 94e6c94c13
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
attacks/Handshake Snooper/attack.sh
View File

@ -17,6 +17,11 @@ function handshake_verifier_daemon() {
trap handle_verifier_abort SIGABRT trap handle_verifier_abort SIGABRT
source lib/HashUtils.sh source lib/HashUtils.sh
touch $FLUXIONWorkspacePath/result.txt
echo "Looking for handshake:" > $FLUXIONWorkspacePath/result.txt
echo "" >> $FLUXIONWorkspacePath/result.txt
xterm $FLUXIONHoldXterm $BOTTOMLEFT -bg "#000000" -fg "#FF0000" -title "UI for handshake" -e "while (true);do clear;cat $FLUXIONWorkspacePath/result.txt; sleep 1;done" &
local handshakeCheckResult=1 # Assume invalid local handshakeCheckResult=1 # Assume invalid
while [ $handshakeCheckResult -ne 0 -a "$handshakeVerifierState" = "running" ]; do while [ $handshakeCheckResult -ne 0 -a "$handshakeVerifierState" = "running" ]; do
@ -24,6 +29,7 @@ function handshake_verifier_daemon() {
pyrit -r "$4" -o "${4/.cap/-clean.cap}" stripLive pyrit -r "$4" -o "${4/.cap/-clean.cap}" stripLive
hash_check_handshake "$3" "${4/.cap/-clean.cap}" "${@:5:2}" hash_check_handshake "$3" "${4/.cap/-clean.cap}" "${@:5:2}"
handshakeCheckResult=$? handshakeCheckResult=$?
echo -n "." >> $FLUXIONWorkspacePath/result.txt
done done
# If handshake didn't pass verification, it was aborted. # If handshake didn't pass verification, it was aborted.
@ -35,6 +41,11 @@ function handshake_verifier_daemon() {
mkdir -p "$hashDirectory" mkdir -p "$hashDirectory"
fi fi
# Custom print for ui
echo "+" >> $FLUXIONWorkspacePath/result.txt
echo "" >> $FLUXIONWorkspacePath/result.txt
echo "Handshake was found !" >> $FLUXIONWorkspacePath/result.txt
# Move handshake to storage if one was acquired. # Move handshake to storage if one was acquired.
mv "${4/.cap/-clean.cap}" "$2" mv "${4/.cap/-clean.cap}" "$2"
@ -45,6 +56,7 @@ function handshake_verifier_daemon() {
function handshake_stop_verifier() { function handshake_stop_verifier() {
if [ "$HANDSHAKEVerifierPID" ]; then if [ "$HANDSHAKEVerifierPID" ]; then
kill -s SIGABRT $HANDSHAKEVerifierPID &> $FLUXIONOutputDevice kill -s SIGABRT $HANDSHAKEVerifierPID &> $FLUXIONOutputDevice
killall xterm
fi fi
HANDSHAKEVerifierPID="" HANDSHAKEVerifierPID=""

2
fluxion.sh
View File

@ -13,7 +13,7 @@ declare -r FLUXIONNoiseFloor=-90
declare -r FLUXIONNoiseCeiling=-60 declare -r FLUXIONNoiseCeiling=-60
declare -r FLUXIONVersion=3 declare -r FLUXIONVersion=3
declare -r FLUXIONRevision=2 declare -r FLUXIONRevision=3
declare -r FLUXIONDebug=${FLUXIONDebug:+1} declare -r FLUXIONDebug=${FLUXIONDebug:+1}
declare -r FLUXIONWIKillProcesses=${FLUXIONWIKillProcesses:+1} declare -r FLUXIONWIKillProcesses=${FLUXIONWIKillProcesses:+1}

6
language/de.sh
View File

@ -16,7 +16,7 @@ FLUXIONLoadingWIDriverNotice="Warte auf Netzwerkarte \"\$wiSelected\"..."
FLUXIONFindingConflictingProcessesNotice="Suche nach Diensten die Probleme verursachen können..." FLUXIONFindingConflictingProcessesNotice="Suche nach Diensten die Probleme verursachen können..."
FLUXIONKillingConflictingProcessesNotice="Beende Diensten die Probleme verursachen können..." FLUXIONKillingConflictingProcessesNotice="Beende Diensten die Probleme verursachen können..."
FLUXIONPhysicalWIDeviceUnknownError="${CRed}Die Physische Schnittstelle konnte nicht ermittelt werden" FLUXIONPhysicalWIDeviceUnknownError="${CRed}Die Physische Schnittstelle konnte nicht ermittelt werden"
FLUXIONStartingWIMonitorNotice="Starte die Grafikkarte im Monitor Mode" FLUXIONStartingWIMonitorNotice="Starte die Netzwerkkarte im Monitor Mode"
FLUXIONMonitorModeWIEnabledNotice="${CGrn}Monitormode konnte erfolgreich gestartet werden" FLUXIONMonitorModeWIEnabledNotice="${CGrn}Monitormode konnte erfolgreich gestartet werden"
FLUXIONMonitorModeWIFailedError="${CRed}Monitormode konnte nicht gestartet werden" FLUXIONMonitorModeWIFailedError="${CRed}Monitormode konnte nicht gestartet werden"
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@ -27,8 +27,8 @@ FLUXIONScannerFailedNotice="Netzwerkkarte ist möglichweise nicht geeignet ( Kei
FLUXIONScannerDetectedNothingNotice="Keine Netzwerke konnten gefunden werden" FLUXIONScannerDetectedNothingNotice="Keine Netzwerke konnten gefunden werden"
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
FLUXIONHashFileDoesNotExistError="Hash Datei existiert nicht" FLUXIONHashFileDoesNotExistError="Hash Datei existiert nicht"
FLUXIONHashInvalidError="${CRed}Error$CClr, falscher Hash" FLUXIONHashInvalidError="${CRed}Fehler$CClr, falscher Hash"
FLUXIONHashValidNotice="${CGrn}Success$CClr,Hash Verifizierung erfolgreich" FLUXIONHashValidNotice="${CGrn}Erfolgreich$CClr,Hash Verifizierung erfolgreich"
FLUXIONPathToHandshakeFileQuery="Geben sie den Pfad zum Handshake an $CClr(Beispiel: /.../dump-01.cap)" FLUXIONPathToHandshakeFileQuery="Geben sie den Pfad zum Handshake an $CClr(Beispiel: /.../dump-01.cap)"
FLUXIONAbsolutePathInfo="Absoluten Pfad" FLUXIONAbsolutePathInfo="Absoluten Pfad"
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>