2.0.0

Johnler · May 23, 2020 · a9c017d · a9c017d
1 parent 5195b2c
commit a9c017d
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 47 deletions.
diff --git a/Installer b/Installer
@@ -9,7 +9,7 @@ fi
 ################################
 
 #Config
-version=1.0.1
+version=2.0.0
 #Colors
 red='\e[1;31m'
 blue='\e[1;34m'
@@ -278,7 +278,7 @@ else
 fi
 sleep 0.025
 ##############################
-echo -ne "Php-cgi........"
+echo -ne "Php-cgi........."
 	if ! hash php-cgi 2>/dev/null; then
 		echo -e "\e[1;31mInstalling ..."$transparent""
 			xterm $HOLD -title "Installing php-cgi" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install php-cgi
@@ -288,24 +288,24 @@ echo -ne "Php-cgi........"
 	sleep 0.025
 ##############################
 
-	echo -ne "Pyrit..........."
-	if ! hash pyrit 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-		xterm $HOLD -title "Installing Pyrit" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install pyrit
-	else
-		echo -e "\e[1;32mOK!"$transparent
-  fi
-	sleep 0.025
-##############################
-
-echo -ne "Python.........."
-	if ! hash python 2>/dev/null; then
-		echo -e "\e[1;31mInstalling ..."$transparent""
-			xterm $HOLD -title "Installing Python" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install python
-	else
-		echo -e "\e[1;32mOK!"$transparent
-  fi
-	sleep 0.025
+# 	echo -ne "Pyrit..........."
+# 	if ! hash pyrit 2>/dev/null; then
+# 		echo -e "\e[1;31mInstalling ..."$transparent""
+# 		xterm $HOLD -title "Installing Pyrit" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install pyrit
+# 	else
+# 		echo -e "\e[1;32mOK!"$transparent
+#   fi
+# 	sleep 0.025
+# ##############################
+
+# echo -ne "Python.........."
+# 	if ! hash python 2>/dev/null; then
+# 		echo -e "\e[1;31mInstalling ..."$transparent""
+# 			xterm $HOLD -title "Installing Python" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install python
+# 	else
+# 		echo -e "\e[1;32mOK!"$transparent
+#   fi
+# 	sleep 0.025
 
 ##############################
 	echo -ne "Reaver.........."
@@ -348,7 +348,7 @@ echo -ne "Xterm..........."
   fi
 	sleep 0.025
 ##############################
-echo -ne "strings.........."
+echo -ne "strings........."
 if ! hash strings 2>/dev/null; then
         echo -e "\e[1;31mInstalling ..."$transparent""
         xterm $HOLD -title "Installing binutils" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install binutils
@@ -357,7 +357,7 @@ else
 fi
 sleep 0.025
 #############################
-echo -ne "fuser............"
+echo -ne "fuser..........."
 if ! hash fuser 2>/dev/null; then
         echo -e "\e[1;31mInstalling ..."$transparent""
         xterm $HOLD -title "Installing psmisc" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get --yes install psmisc
@@ -366,7 +366,7 @@ else
 fi
 sleep 0.025
 ##############################
-	echo -ne "Git..........."
+	echo -ne "Git............."
 	if ! hash git 2>/dev/null; then
 		echo -e "\e[1;31mInstalling ..."$transparent""
 		xterm $HOLD -title "Installing git" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get -y install git
@@ -385,8 +385,8 @@ sleep 0.025
 sleep 0.025
 
 ##############################
-	echo -ne "Hostapd-mana..........."
-	if ! hash hostapd-mana 2>/dev/null; then
+	echo -ne "Hostapd-mana...."
+	if [ ! -d "./hostapd-mana" ]; then
 		echo -e "\e[1;31mInstalling ..."$transparent""
 		xterm $HOLD -title "Installing Hostapd-mana" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e apt-get -y install build-essential pkg-config libnl-genl-3-dev libssl-dev && git clone https://github.com/sensepost/hostapd-mana && cd hostapd-mana && make -C hostapd
 	else

diff --git a/README.md b/README.md
@@ -1,8 +1,15 @@
 ![alt text](https://github.com/Johnler/Wi-Ploit/blob/master/WifiExploit.jpg)
 # Wi-Ploit 1.0.1
 Wi-Ploit is a library of Wi-Fi exploitation tools.  
-Supports latest other tools e.g: Aircrack-ng etc.
 * Base code script of deltaflux Fluxion old version.
+* For old Kali/ParrotOs version.
+
+# (New Update)Wi-Ploit 2.0.0
+Wi-Ploit is a library of Wi-Fi exploitation tools.
+* Removes Python2 and dependecies.
+** Pryit (disabled, waiting for python3 release).
+* Updated Scripts.
+* Tested on Kali (2020-05-12)
 
 # Attacks:
 1. Rogue Access Point (hostapd).  

diff --git a/airmon b/airmon
diff --git a/wiploit b/wiploit
@@ -34,7 +34,7 @@ PASSLOG_PATH="/root/pwlog"
 WORK_DIR='pwd'
 MANA_DIR=$(pwd)/hostapd-mana/hostapd
 DEAUTHTIME="99999999999"
-version=1.0.1
+version=2.0.0
 IP=192.168.1.1
 RANG_IP=$(echo $IP | cut -d "." -f 1,2,3)
 
@@ -363,6 +363,14 @@ echo -ne "aircrack-ng....."
 	fi
 	sleep 0.025
 
+	echo -ne "hostapd-mana...."
+	if [ ! -d "./hostapd-mana" ]; then
+		echo -e "\e[1;31mNot installed"$transparent""
+		exit=1
+	else
+		echo -e "\e[1;32mOK!"$transparent""
+	fi
+	sleep 0.025
 	echo -ne "iwconfig........"
 	if ! hash iwconfig 2>/dev/null; then
 		echo -e "\e[1;31mNot installed"$transparent""
@@ -415,24 +423,24 @@ echo -ne "aircrack-ng....."
 		exit=1
 	else
 		echo -e "\e[1;32mOK!"$transparent""
-	fi
-	sleep 0.025
+	# fi
+	# sleep 0.025
 
-	echo -ne "pyrit..........."
-	if ! hash pyrit 2>/dev/null; then
-		echo -e "\e[1;31mNot installed"$transparent""
-		exit=1
-	else
-		echo -e "\e[1;32mOK!"$transparent""
-	fi
-	sleep 0.025
+	# echo -ne "pyrit..........."
+	# if ! hash pyrit 2>/dev/null; then
+	# 	echo -e "\e[1;31mNot installed"$transparent""
+	# 	exit=1
+	# else
+	# 	echo -e "\e[1;32mOK!"$transparent""
+	# fi
+	# sleep 0.025
 
-	echo -ne "python.........."
-	if ! hash python 2>/dev/null; then
-		echo -e "\e[1;31mNot installed"$transparent""
-		exit=1
-	else
-		echo -e "\e[1;32mOK!"$transparent""
+	# echo -ne "python.........."
+	# if ! hash python 2>/dev/null; then
+	# 	echo -e "\e[1;31mNot installed"$transparent""
+	# 	exit=1
+	# else
+	# 	echo -e "\e[1;32mOK!"$transparent""
 	fi
 	sleep 0.025
 
@@ -1173,16 +1181,16 @@ function deauthforce {
 			echo -e ""$red"["$yellow"i"$red"]"$transparent" $header_deauthforce"
 			echo "                                       "
 			echo -e "      "$red"["$yellow"1"$red"]"$transparent" $deauthforce_option_1"
-			echo -e "      "$red"["$yellow"2"$red"]"$transparent" pyrit"
-			echo -e "      "$red"["$yellow"3"$red"]"$transparent" $general_back"
+			# echo -e "      "$red"["$yellow"2"$red"]"$transparent" pyrit"
+			echo -e "      "$red"["$yellow"2"$red"]"$transparent" $general_back"
 			echo "                                       "
 			echo -n -e ""$red"["$blue$USER$yellow"@"$white"wiploit"$red"]-["$yellow"~"$red"]"$transparent""
 			read yn
 			echo ""
 			case $yn in
 				1 ) handshakemode="normal"; askclientsel; break ;;
-				2 ) handshakemode="hard"; askclientsel; break ;;
-				3 ) askauth; break ;;
+				# 2 ) handshakemode="hard"; askclientsel; break ;;
+				2 ) askauth; break ;;
 				* ) echo "
 		$general_case_error"; conditional_clear ;;
 			esac