From 0bdf588941ac83bd858b926e61fde35624b6c1f5 Mon Sep 17 00:00:00 2001
From: TrustedSec <davek@trustedsec.com>
Date: Mon, 17 Jun 2013 18:40:17 -0400
Subject: [PATCH] Removed older encodings and some wording

---
 src/core/dictionaries.py | 20 ++++----------------
 src/core/menu/text.py    | 20 ++++----------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/core/dictionaries.py b/src/core/dictionaries.py
index 0d9490874..156c9adb2 100644
--- a/src/core/dictionaries.py
+++ b/src/core/dictionaries.py
@@ -13,22 +13,10 @@ def encoder_type(encode):
 
     return {
             '0':"",
-            '1':"avoid_utf8_tolower",
-            '2':"shikata_ga_nai",
-            '3':"alpha_mixed",
-            '4':"alpha_upper",
-            '5':"call4_dword_xor",
-            '6':"countdown",
-            '7':"fnstenv_mov",
-            '8':"jmp_call_additive",
-            '9':"nonalpha",
-            '10':"nonupper",
-            '11':"unicode_mixed",
-            '12':"unicode_upper",
-            '13':"alpha2",
-            '14':"",
-            '15':"MULTIENCODE",
-            '16':"BACKDOOR",
+            '1':"shikata_ga_nai",
+            '2':"",
+            '3':"MULTIENCODE",
+            '4':"BACKDOOR",
             }.get(encode,"ERROR")
 
 
diff --git a/src/core/menu/text.py b/src/core/menu/text.py
index 084b0c0ff..f8e4f9b89 100644
--- a/src/core/menu/text.py
+++ b/src/core/menu/text.py
@@ -402,22 +402,10 @@ powershell_text = ("""
 The """ + bcolors.BOLD + """Powershell Attack Vector""" + bcolors.ENDC + """ module allows you to create PowerShell specific attacks. These attacks will allow you to use PowerShell which is available by default in all operating systems Windows Vista and above. PowerShell provides a fruitful  landscape for deploying payloads and performing functions that  do not get triggered by preventative technologies.\n""")
 
 
-encoder_menu = ['avoid_utf8_tolower (Normal)',
-                'shikata_ga_nai (Very Good)',
-                'alpha_mixed (Normal)',
-                'alpha_upper (Normal)',
-                'call4_dword_xor (Normal)',
-                'countdown (Normal)',
-                'fnstenv_mov (Normal)',
-                'jmp_call_additive (Normal)',
-                'nonalpha (Normal)',
-                'nonupper (Normal)',
-                'unicode_mixed (Normal)',
-                'unicode_upper (Normal)',
-                'alpha2 (Normal)',
-                'No Encoding (None)',
-                'Multi-Encoder (Excellent)',
-                'Backdoored Executable (BEST)\n']
+encoder_menu = ['shikata_ga_nai',
+                'No Encoding',
+                'Multi-Encoder',
+                'Backdoored Executable\n']
 
 encoder_text = """
 Select one of the below, 'backdoored executable' is typically the best. However,