From 7d3b9fa54599e7eee98dd000f0ce1b3582fe671e Mon Sep 17 00:00:00 2001
From: Patricia Gagnon-Renaud <pgrenaud@gosecure.net>
Date: Wed, 15 Jan 2025 13:52:34 -0500
Subject: [PATCH 1/4] Remove duplicate testssl repo

# Conflicts:
#	install.sh
#	reconftw.sh
---
 install.sh  | 11 +----------
 reconftw.sh |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/install.sh b/install.sh
index 8e69e5a4..bb5bde0e 100755
--- a/install.sh
+++ b/install.sh
@@ -114,7 +114,7 @@ declare -A repos=(
 	["fav-up"]="pielco11/fav-up"
 	["massdns"]="blechschmidt/massdns"
 	["Oralyzer"]="r0075h3ll/Oralyzer"
-	["testssl"]="drwetter/testssl.sh"
+	["testssl.sh"]="drwetter/testssl.sh"
 	["commix"]="commixproject/commix"
 	["JSA"]="w9w/JSA"
 	["CloudHunter"]="belane/CloudHunter"
@@ -520,15 +520,6 @@ function initial_setup() {
 		eval git -C "${dir}/sqlmap" pull $DEBUG_STD
 	fi
 
-	# testssl.sh
-	if [[ ! -d "${dir}/testssl.sh" ]]; then
-		#printf "${yellow}Cloning testssl.sh...${reset}\n"
-		eval git clone --depth 1 https://github.com/drwetter/testssl.sh.git "${dir}/testssl.sh" $DEBUG_STD
-	else
-		#printf "${yellow}Updating testssl.sh...${reset}\n"
-		eval git -C "${dir}/testssl.sh" pull $DEBUG_STD
-	fi
-
 	# massdns
 	if [[ ! -d "${dir}/massdns" ]]; then
 		#printf "${yellow}Cloning and compiling massdns...${reset}\n"
diff --git a/reconftw.sh b/reconftw.sh
index 7458b874..9669149f 100755
--- a/reconftw.sh
+++ b/reconftw.sh
@@ -122,7 +122,7 @@ function tools_installed() {
 		["dorks_hunter"]="${tools}/dorks_hunter/dorks_hunter.py"
 		["fav-up"]="${tools}/fav-up/favUp.py"
 		["Corsy"]="${tools}/Corsy/corsy.py"
-		["testssl"]="${tools}/testssl.sh/testssl.sh"
+		["testssl.sh"]="${tools}/testssl.sh/testssl.sh"
 		["CMSeeK"]="${tools}/CMSeeK/cmseek.py"
 		["OneListForAll"]="$fuzz_wordlist"
 		["lfi_wordlist"]="$lfi_wordlist"

From c006297e13e0d31118d5e3efb509ee0bf56bbe25 Mon Sep 17 00:00:00 2001
From: Patricia Gagnon-Renaud <pgrenaud@gosecure.net>
Date: Wed, 15 Jan 2025 13:52:51 -0500
Subject: [PATCH 2/4] Fix ffufPostprocessing branch name

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index bb5bde0e..55ad336c 100755
--- a/install.sh
+++ b/install.sh
@@ -249,7 +249,7 @@ function install_tools() {
 			chmod +x ./nomore403
 			;;
 		"ffufPostprocessing")
-			git reset --hard origin/main &>/dev/null
+			git reset --hard origin/master &>/dev/null
 			git pull &>/dev/null
 			go build -o ffufPostprocessing main.go &>/dev/null
 			chmod +x ./ffufPostprocessing

From ccea240118f313a98d9ba0c84e0889be71711394 Mon Sep 17 00:00:00 2001
From: Patricia Gagnon-Renaud <pgrenaud@gosecure.net>
Date: Wed, 15 Jan 2025 13:53:23 -0500
Subject: [PATCH 3/4] Add special handling for trufflehog

---
 install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install.sh b/install.sh
index 55ad336c..985e0529 100755
--- a/install.sh
+++ b/install.sh
@@ -260,6 +260,9 @@ function install_tools() {
 			go build -o misconfig-mapper &>/dev/null
 			chmod +x ./misconfig-mapper
 			;;
+		"trufflehog")
+			go install &>/dev/null
+			;;
 		esac
 
 		# Copy gf patterns if applicable

From 3d61386973325fda6ea917414d5e2b4f60c420a5 Mon Sep 17 00:00:00 2001
From: Patricia Gagnon-Renaud <pgrenaud@gosecure.net>
Date: Wed, 15 Jan 2025 13:53:50 -0500
Subject: [PATCH 4/4] Copy gf patterns instead of moving

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 985e0529..83017261 100755
--- a/install.sh
+++ b/install.sh
@@ -269,7 +269,7 @@ function install_tools() {
 		if [[ $repo == "gf" ]]; then
 			cp -r examples ${HOME}/.gf &>/dev/null
 		elif [[ $repo == "Gf-Patterns" ]]; then
-			mv ./*.json ${HOME}/.gf &>/dev/null
+			cp ./*.json ${HOME}/.gf &>/dev/null
 		fi
 
 		# Return to the main directory