Release v3.9 (#21)

* Version update + extra option * Added 21-custom-brute-force.sh * Update VERSION.md * Update parameter.sh * Update VERSION.md * Update trap behavior - all processors * Removed blank lines * Update hash-cracker.sh
sensepost · Oct 30, 2023 · eb804b7 · eb804b7
1 parent 4598ffb
commit eb804b7
Show file tree

Hide file tree

Showing 24 changed files with 211 additions and 92 deletions.
diff --git a/VERSION.md b/VERSION.md
@@ -1,5 +1,10 @@
 # Version log
 
+## v3.9 - Custom Brute Force
+
+* For the heavy lifters, you can now do custom length brute force attacks
+* Changed the behavior of `trap` to not only clean temporary files but keep hash-cracker alive when intentionally or unintentionally `CTRL+C` is pressed
+
 ## v3.8 - Keep it static
 
 * Even more ability to set static parameters

diff --git a/hash-cracker.sh b/hash-cracker.sh
@@ -2,7 +2,7 @@
 # Author: crypt0rr - https://github.com/crypt0rr/
 
 function hash-cracker () {
-    echo -e "\nhash-cracker v3.8 Apple Silicon Edition by crypt0rr (https://github.com/crypt0rr)"
+    echo -e "\nhash-cracker v3.9 Apple Silicon Edition by crypt0rr (https://github.com/crypt0rr)"
 }
 
 function menu () {
@@ -26,9 +26,10 @@ function menu () {
     echo "17. Markov-chain passwords generator"
     echo "18. CeWL wordlist generator"
     echo "19. Digit remover"
-    echo -e "20. Stacker\n"
+    echo "20. Stacker"
+    echo -e "21. Custom brute force\n"
 
-    read -p "Please enter job number: " START
+    read -p "Please enter job number or type exit: " START
     if [[ "$START" = "0" ]] || [[ "$START" = "exit" ]]; then
         echo "Bye..."; exit 1
     elif [[ $START = '1' ]]; then
@@ -71,6 +72,8 @@ function menu () {
         source scripts/processors/19-digitremover.sh   
     elif [[ $START = '20' ]]; then
         source scripts/processors/20-stacker.sh
+    elif [[ $START = '21' ]]; then
+        source scripts/processors/21-custom-brute-force.sh
     else
         echo -e "Not valid, try again\n"; menu
     fi

diff --git a/scripts/parameters.sh b/scripts/parameters.sh
@@ -33,7 +33,8 @@ elif [ "$1" == '--module-info' ]; then
     echo "17. Markov-chain password generator will generate new password sets based on Time-Space Tradeoff - https://www.cs.cornell.edu/~shmat/shmat_ccs05pwd.pdf"
     echo "18. Custom Word List Generator - CeWL - Spiders a given URL and creates a custom wordlist."
     echo "19. Will take the potfile, strip the digits from the cleartexts and perform a hybrid attack accordingly, thereafter some rules to finish the job."
-    echo "20. Using the stacking58.rule with a rule stacked on top of it to create even more variation on the randomness." 
+    echo "20. Using the stacking58.rule with a rule stacked on top of it to create even more variation on the randomness."
+    echo "21. You can specify a lenght you want to brute-force, this will use the '?a' setting so the full charspace. Incremental approach is optional."
     exit 1
 elif [ "$1" == '-s' ] || [ "$1" == '--search' ]; then
     TYPELIST="scripts/extensions/hashtypes"

diff --git a/scripts/processors/1-bruteforce.sh b/scripts/processors/1-bruteforce.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch
+function clean_up {
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf

diff --git a/scripts/processors/10-prefixsuffix.sh b/scripts/processors/10-prefixsuffix.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch + cleanup of temp files
+function clean_up {
+    rm $tmp $tmp2 $tmp3 $tmp4 2>/dev/null
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf
@@ -9,14 +17,6 @@ else
     source scripts/selectors/hashlist.sh
 fi
 
-# Cleanup
-function clean_up {
-    rm $tmp $tmp2 $tmp3 $tmp4 2>/dev/null
-    exit
-}
-
-trap clean_up SIGINT SIGTERM
-
 # Temporary Files
 tmp=$(mktemp /tmp/hash-cracker-tmp.XXXX)
 tmp2=$(mktemp /tmp/hash-cracker-tmp.XXXX)

diff --git a/scripts/processors/11-commonsubstring.sh b/scripts/processors/11-commonsubstring.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch + cleanup of temp files
+function clean_up {
+    rm $tmp $tmp2 $tmp3 $tmp4 2>/dev/null
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf
@@ -9,14 +17,6 @@ else
     source scripts/selectors/hashlist.sh
 fi
 
-# Cleanup
-function clean_up {
-    rm $tmp $tmp2 $tmp3 $tmp4 2>/dev/null
-    exit
-}
-
-trap clean_up SIGINT SIGTERM
-
 # Temporary Files
 tmp=$(mktemp /tmp/hash-cracker-tmp.XXXX)
 tmp2=$(mktemp /tmp/hash-cracker-tmp.XXXX)

diff --git a/scripts/processors/12-pack-rule.sh b/scripts/processors/12-pack-rule.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch + cleanup of temp files
+function clean_up {
+    rm $tmp analysis.rule 2>/dev/null
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf
@@ -9,14 +17,6 @@ else
     source scripts/selectors/hashlist.sh
 fi
 
-# Cleanup
-function clean_up {
-    rm $tmp analysis.rule 2>/dev/null
-    exit
-}
-
-trap clean_up SIGINT SIGTERM
-
 # Temporary Files
 tmp=$(mktemp /tmp/hash-cracker-tmp.XXXX)
 

diff --git a/scripts/processors/13-pack-mask.sh b/scripts/processors/13-pack-mask.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch + cleanup of temp files
+function clean_up {
+    rm $tmp $tmp2 $tmp3 2>/dev/null
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf
@@ -9,14 +17,6 @@ else
     source scripts/selectors/hashlist.sh
 fi
 
-# Cleanup
-function clean_up {
-    rm $tmp $tmp2 $tmp3 2>/dev/null
-    exit
-}
-
-trap clean_up SIGINT SIGTERM
-
 # Temporary Files
 tmp=$(mktemp /tmp/hash-cracker-tmp.XXXX)
 tmp2=$(mktemp /tmp/hash-cracker-tmp.XXXX)

diff --git a/scripts/processors/14-fingerprint.sh b/scripts/processors/14-fingerprint.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch + cleanup of temp files
+function clean_up {
+    rm $tmp $tmp2 2>/dev/null
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf
@@ -9,14 +17,6 @@ else
     source scripts/selectors/hashlist.sh
 fi
 
-# Cleanup
-function clean_up {
-    rm $tmp $tmp2 2>/dev/null
-    exit
-}
-
-trap clean_up SIGINT SIGTERM
-
 # Temporary Files
 tmp=$(mktemp /tmp/hash-cracker-tmp.XXXX)
 tmp2=$(mktemp /tmp/hash-cracker-tmp.XXXX)

diff --git a/scripts/processors/15-multiple-wordlists.sh b/scripts/processors/15-multiple-wordlists.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch
+function clean_up {
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf

diff --git a/scripts/processors/16-usernameaspassword.sh b/scripts/processors/16-usernameaspassword.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch + cleanup of temp files
+function clean_up {
+    rm $tmp 2>/dev/null
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf
@@ -13,14 +21,6 @@ fi
 source scripts/rules/rules.config
 RULELIST=($big $fbfull $d3ad0ne $d3adhob0 $digits1 $digits2 $digits3 $dive $fordyv1 $generated2 $generated3 $hob064 $huge $leetspeak $NSAKEYv2 $ORTRTS $OUTD $pantag $passwordpro $rockyou30000 $techtrip2 $tenKrules $toggles1 $toggles2 $toprules2020 $TOXIC10k $TOXICSP $williamsuper)
 
-# Cleanup
-function clean_up {
-    rm $tmp 2>/dev/null
-    exit
-}
-
-trap clean_up SIGINT SIGTERM
-
 # Temporary Files
 tmp=$(mktemp /tmp/hash-cracker-tmp.XXXX)
 

diff --git a/scripts/processors/17-markov-generator.sh b/scripts/processors/17-markov-generator.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch + cleanup of temp files
+function clean_up {
+    rm $tmp $tmp2 2>/dev/null
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf
@@ -13,14 +21,6 @@ fi
 source scripts/rules/rules.config
 RULELIST=($rule3 $rockyou30000 $ORTRTS $fbfull $pantag $OUTD $techtrip2 $TOXICSP $passwordpro $d3ad0ne $d3adhob0 $generated2 $toprules2020 $hob064 $leetspeak)
 
-# Cleanup
-function clean_up {
-    rm $tmp $tmp2 2>/dev/null
-    exit
-}
-
-trap clean_up SIGINT SIGTERM
-
 # Temporary Files
 tmp=$(mktemp /tmp/hash-cracker-tmp.XXXX)
 tmp2=$(mktemp /tmp/hash-cracker-tmp.XXXX)

diff --git a/scripts/processors/18-cewl.sh b/scripts/processors/18-cewl.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch
+function clean_up {
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Logic
 read -p "Please enter the full URL to spider (e.g. https://kb.offsec.nl): " URL
 read -p "Output name for the CeWL wordlist: " CEWLLIST

diff --git a/scripts/processors/19-digitremover.sh b/scripts/processors/19-digitremover.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch + cleanup of temp files
+function clean_up {
+    rm $tmp 2>/dev/null
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf
@@ -13,14 +21,6 @@ fi
 source scripts/rules/rules.config
 RULELIST=($fbfull $ORTRTS $NSAKEYv2 $techtrip2)
 
-# Cleanup
-function clean_up {
-    rm $tmp 2>/dev/null
-    exit
-}
-
-trap clean_up SIGINT SIGTERM
-
 # Temporary Files
 tmp=$(mktemp /tmp/hash-cracker-tmp.XXXX)
 

diff --git a/scripts/processors/2-light.sh b/scripts/processors/2-light.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch
+function clean_up {
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf

diff --git a/scripts/processors/20-stacker.sh b/scripts/processors/20-stacker.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # Author: crypt0rr - https://github.com/crypt0rr/
 
+# CTRL-C catch
+function clean_up {
+    source hash-cracker.sh
+}
+
+trap clean_up SIGINT SIGTERM
+
 # Requirements
 if [[ "$STATICCONFIG" = true ]]; then
     source hash-cracker.conf