diff --git a/hate_crack.py b/hate_crack.py index b0eef36..d42fbad 100755 --- a/hate_crack.py +++ b/hate_crack.py @@ -83,18 +83,18 @@ def get_main_menu_options(): "7": _attacks.hybrid_crack, "8": _attacks.pathwell_crack, "9": _attacks.prince_attack, - "13": _attacks.bandrel_method, - "14": _attacks.loopback_attack, - "15": _attacks.ollama_attack, - "16": _attacks.omen_attack, - "17": _attacks.adhoc_mask_crack, - "18": _attacks.markov_brute_force, - "19": _attacks.ngram_attack, - "20": _attacks.permute_crack, - "21": _attacks.generate_rules_crack, - "22": _attacks.combipow_crack, - "23": _attacks.pcfg_attack, - "24": _attacks.prince_ling_attack, + "10": _attacks.bandrel_method, + "11": _attacks.loopback_attack, + "12": _attacks.ollama_attack, + "13": _attacks.omen_attack, + "14": _attacks.adhoc_mask_crack, + "15": _attacks.markov_brute_force, + "16": _attacks.ngram_attack, + "17": _attacks.permute_crack, + "18": _attacks.generate_rules_crack, + "19": _attacks.combipow_crack, + "20": _attacks.pcfg_attack, + "21": _attacks.prince_ling_attack, "80": _attacks.wordlist_tools_submenu, "81": _attacks.rule_tools_submenu, "82": notifications_submenu, diff --git a/hate_crack/main.py b/hate_crack/main.py index 5b61e7e..9f36343 100755 --- a/hate_crack/main.py +++ b/hate_crack/main.py @@ -4365,18 +4365,18 @@ def get_main_menu_items(): ("7", "Hybrid Attack"), ("8", "Pathwell Top 100 Mask Brute Force Crack"), ("9", "PRINCE Attack"), - ("13", "Bandrel Methodology"), - ("14", "Loopback Attack"), - ("15", "LLM Attack"), - ("16", "OMEN Attack"), - ("17", "Ad-hoc Mask Attack"), - ("18", "Markov Brute Force Attack"), - ("19", "N-gram Attack"), - ("20", "Permutation Attack"), - ("21", "Random Rules Attack"), - ("22", "Combipow Passphrase Attack"), - ("23", "PCFG Attack"), - ("24", "PRINCE-LING Attack"), + ("10", "Bandrel Methodology"), + ("11", "Loopback Attack"), + ("12", "LLM Attack"), + ("13", "OMEN Attack"), + ("14", "Ad-hoc Mask Attack"), + ("15", "Markov Brute Force Attack"), + ("16", "N-gram Attack"), + ("17", "Permutation Attack"), + ("18", "Random Rules Attack"), + ("19", "Combipow Passphrase Attack"), + ("20", "PCFG Attack"), + ("21", "PRINCE-LING Attack"), ("80", "Wordlist Tools"), ("81", "Rule File Tools"), ("82", "Notifications"), @@ -4411,18 +4411,18 @@ def get_main_menu_options(): "7": hybrid_crack, "8": pathwell_crack, "9": prince_attack, - "13": bandrel_method, - "14": loopback_attack, - "15": ollama_attack, - "16": omen_attack, - "17": adhoc_mask_crack, - "18": markov_brute_force, - "19": ngram_attack, - "20": permute_crack, - "21": generate_rules_crack, - "22": combipow_crack, - "23": pcfg_attack, - "24": prince_ling_attack, + "10": bandrel_method, + "11": loopback_attack, + "12": ollama_attack, + "13": omen_attack, + "14": adhoc_mask_crack, + "15": markov_brute_force, + "16": ngram_attack, + "17": permute_crack, + "18": generate_rules_crack, + "19": combipow_crack, + "20": pcfg_attack, + "21": prince_ling_attack, "80": wordlist_tools_submenu, "81": rule_tools_submenu, "82": notifications_submenu, diff --git a/tests/test_combipow_attack.py b/tests/test_combipow_attack.py index 4952ef6..7d6f0eb 100644 --- a/tests/test_combipow_attack.py +++ b/tests/test_combipow_attack.py @@ -46,16 +46,16 @@ def _make_ctx(hash_type="1000", hash_file="/tmp/hashes.txt"): def test_combipow_crack_in_main_menu(cli): options = cli.get_main_menu_options() - assert "22" in options + assert "19" in options def test_combipow_crack_menu_item_label(): cli = _load_cli() items = cli.get_main_menu_items() keys = [k for k, _ in items] - assert "22" in keys + assert "19" in keys labels = {k: label for k, label in items} - assert "passphrase" in labels["22"].lower() or "combipow" in labels["22"].lower() + assert "passphrase" in labels["19"].lower() or "combipow" in labels["19"].lower() # --- combipow_crack handler tests --- diff --git a/tests/test_random_rules_attack.py b/tests/test_random_rules_attack.py index c2d7761..d9c8ebc 100644 --- a/tests/test_random_rules_attack.py +++ b/tests/test_random_rules_attack.py @@ -36,7 +36,7 @@ def cli(): def test_generate_rules_crack_in_main_menu(cli): options = cli.get_main_menu_options() - assert "21" in options + assert "18" in options def test_generate_rules_crack_handler_calls_main(cli, tmp_path): diff --git a/tests/test_ui_menu_options.py b/tests/test_ui_menu_options.py index 82e9ab3..ab938d6 100644 --- a/tests/test_ui_menu_options.py +++ b/tests/test_ui_menu_options.py @@ -20,18 +20,18 @@ MENU_OPTION_TEST_CASES = [ ("7", CLI_MODULE._attacks, "hybrid_crack", "hybrid"), ("8", CLI_MODULE._attacks, "pathwell_crack", "pathwell"), ("9", CLI_MODULE._attacks, "prince_attack", "prince"), - ("13", CLI_MODULE._attacks, "bandrel_method", "bandrel"), - ("14", CLI_MODULE._attacks, "loopback_attack", "loopback"), - ("15", CLI_MODULE._attacks, "ollama_attack", "ollama"), - ("16", CLI_MODULE._attacks, "omen_attack", "omen"), - ("17", CLI_MODULE._attacks, "adhoc_mask_crack", "adhoc-mask"), - ("18", CLI_MODULE._attacks, "markov_brute_force", "markov-brute"), - ("19", CLI_MODULE._attacks, "ngram_attack", "ngram"), - ("20", CLI_MODULE._attacks, "permute_crack", "permute"), - ("21", CLI_MODULE._attacks, "generate_rules_crack", "random-rules"), - ("22", CLI_MODULE._attacks, "combipow_crack", "combipow"), - ("23", CLI_MODULE._attacks, "pcfg_attack", "pcfg"), - ("24", CLI_MODULE._attacks, "prince_ling_attack", "prince-ling"), + ("10", CLI_MODULE._attacks, "bandrel_method", "bandrel"), + ("11", CLI_MODULE._attacks, "loopback_attack", "loopback"), + ("12", CLI_MODULE._attacks, "ollama_attack", "ollama"), + ("13", CLI_MODULE._attacks, "omen_attack", "omen"), + ("14", CLI_MODULE._attacks, "adhoc_mask_crack", "adhoc-mask"), + ("15", CLI_MODULE._attacks, "markov_brute_force", "markov-brute"), + ("16", CLI_MODULE._attacks, "ngram_attack", "ngram"), + ("17", CLI_MODULE._attacks, "permute_crack", "permute"), + ("18", CLI_MODULE._attacks, "generate_rules_crack", "random-rules"), + ("19", CLI_MODULE._attacks, "combipow_crack", "combipow"), + ("20", CLI_MODULE._attacks, "pcfg_attack", "pcfg"), + ("21", CLI_MODULE._attacks, "prince_ling_attack", "prince-ling"), ("80", CLI_MODULE._attacks, "wordlist_tools_submenu", "wordlist-tools"), ("81", CLI_MODULE._attacks, "rule_tools_submenu", "rule-tools"), ("82", CLI_MODULE, "notifications_submenu", "notifications-submenu"),