Replace docker-compose, add hashcat 6, update openssl and eaphammer

r4ulcl · Feb 12, 2024 · b700137 · b700137
1 parent ac870b7
commit b700137
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 21 deletions.
diff --git a/Attacker/installTools.sh b/Attacker/installTools.sh
@@ -5,13 +5,14 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 
+sudo apt-get install curl git -y
+
 # Rockyou
 cd 
 curl https://github.com/brannondorsey/naive-hashcat/releases/download/data/rockyou.txt -s -L | head -n 1000000 > ~/rockyou-top100000.txt
 #wget https://github.com/brannondorsey/naive-hashcat/releases/download/data/rockyou.txt
 wget https://raw.githubusercontent.com/danielmiessler/SecLists/master/Usernames/top-usernames-shortlist.txt
 
-
 # Hacking tools
 FOLDER=`pwd`
 TOOLS=$FOLDER/tools
@@ -40,10 +41,11 @@ git clone https://github.com/blackarrowsec/EAP_buster
 # OpenSSL 3 for ubuntu
 sudo apt-get install build-essential checkinstall zlib1g-dev -y
 cd /usr/local/src/
-wget https://www.openssl.org/source/openssl-3.0.2.tar.gz
-sudo tar -xvf openssl-3.0.2.tar.gz
-rm openssl-3.0.2.tar.gz
-cd openssl-3.0.2
+VERSION='openssl-3.2.1'
+wget https://www.openssl.org/source/$VERSION.tar.gz
+tar -xvf $VERSION.tar.gz > /dev/null
+rm $VERSION.tar.gz
+cd $VERSION
 ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib
 make
 make test
@@ -53,6 +55,14 @@ make install
 cd $TOOLS
 sudo apt-get install python3-pip sqlitebrowser -y
 sudo DEBIAN_FRONTEND=noninteractive apt-get install tshark -y
+sudo apt install pkg-config libcurl4-openssl-dev libssl-dev zlib1g-dev make gcc -y
+
+git clone https://github.com/ZerBea/hcxtools.git
+cd hcxtools
+make 
+sudo make install
+cd ..
+
 git clone https://github.com/r4ulcl/wifi_db
 cd wifi_db
 pip3 install -r requirements.txt 
@@ -64,7 +74,7 @@ chmod +x pcapFilter.sh
 
 #Eaphhammer
 cd $TOOLS
-git clone https://github.com/r4ulcl/eaphammer.git
+git clone https://github.com/s0lst1c3/eaphammer.git
 cd eaphammer
 for L in `cat kali-dependencies.txt` ; do echo $L; apt-get install $L -y ;done
 sudo apt-get install dsniff apache2 -y
@@ -105,8 +115,20 @@ make install
 #aircrack
 apt-get install aircrack-ng -y
 
-apt-get install hashcat -y
+# hashcat
+#apt-get install hashcat -y
+sudo apt purge hashcat
+
+wget https://hashcat.net/files/hashcat-6.0.0.7z
+sudo p7zip -d hashcat-*
+cd hashcat-6.0.0/
 
+sudo cp hashcat.bin /usr/bin/
+sudo ln -s /usr/bin/hashcat.bin /usr/bin/hashcat
+sudo cp -Rv OpenCL/ /usr/bin/
+sudo cp -Rv modules/ /usr/bin/
+sudo cp hashcat.hcstat2 /usr/bin/
+sudo cp hashcat.hctune /usr/bin/
 
 # Creap
 cd $TOOLS

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -55,7 +55,7 @@ services:
     deploy:
         resources:
             limits:
-              cpus: 0.50
+              cpus: "0.50"
               memory: 512M
             reservations:
               memory: 128M
@@ -85,7 +85,7 @@ services:
     deploy:
         resources:
             limits:
-              cpus: 0.50
+              cpus: "0.50"
               memory: 512M
             reservations:
               memory: 128M

diff --git a/vagrant/create.sh b/vagrant/create.sh
@@ -7,7 +7,7 @@ HALT=true
 OPTION=$1
 
 if [ -z "${OPTION}" ]; then
-    echo "Unknown option, only VMware or VirtualBox"
+    echo "Unknown option, only vmware, virtualbox or both"
     exit 1
 fi
 

diff --git a/vagrant/install.sh b/vagrant/install.sh
@@ -54,11 +54,6 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun
 sudo apt-get update
 sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 
-## Install docker-compose
-#sudo apt-get install -y docker-compose
-sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-sudo chmod +x /usr/local/bin/docker-compose
-
 # Fix DNS error Docker
 sudo apt-get install bridge-utils -y
 sudo service docker restart
@@ -91,8 +86,8 @@ sudo apt-get install -y p7zip-full
 
 ## Enable docker
 cd /var/WiFiChallenge/
-sudo docker-compose -f docker-compose.yml up -d
-#sudo docker-compose -f docker-compose-minimal.yml up -d
+sudo docker compose -f docker-compose.yml up -d
+#sudo docker compose -f docker-compose-minimal.yml up -d
 
 
 ## remove all non-essential programs in an Ubuntu 20 minimal ISO-based Vagrant VM
@@ -118,15 +113,15 @@ echo 'flag{JPTEXm5yEaYouyIEFffEvPjil}' | sudo tee /root/flag.txt
 echo '#!/bin/bash
 cd /var/WiFiChallenge
 
-sudo docker-compose restart aps
-sudo docker-compose restart clients' | sudo tee /root/restartWiFi.sh  /home/user/restartWiFi.sh
+sudo docker compose restart aps
+sudo docker compose restart clients' | sudo tee /root/restartWiFi.sh  /home/user/restartWiFi.sh
 chmod +x /root/restartWiFi.sh  /home/user/restartWiFi.sh
 
 echo '#!/bin/bash
 #Update images from AP and clients
 cd /var/WiFiChallenge
-sudo docker-compose pull
-sudo docker-compose up --detach
+sudo docker compose pull
+sudo docker compose up --detach
 ' | sudo tee /root/updateWiFiChallengeLab.sh  /home/user/updateWiFiChallengeLab.sh
 chmod +x /root/updateWiFiChallengeLab.sh  /home/user/updateWiFiChallengeLab.sh