From 58d87f9da20dd2eae2fc3b08698457b545c841fa Mon Sep 17 00:00:00 2001
From: trustedsec <davek@trustedsec.com>
Date: Thu, 7 Feb 2013 21:05:40 -0500
Subject: [PATCH] Bug fixing mode, fixed powershell and pycrypto bug

---
 readme/CHANGES               |  7 +++++++
 set                          |  9 +++++++++
 src/core/setcore.py          | 10 +---------
 src/powershell/powershell.py |  5 +++--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/readme/CHANGES b/readme/CHANGES
index 916fcd278..a25601148 100644
--- a/readme/CHANGES
+++ b/readme/CHANGES
@@ -1,3 +1,10 @@
+~~~~~~~~~~~~~~~~
+version 4.4.3
+~~~~~~~~~~~~~~~~
+
+* Fixed a pycrypto bug that would cause SET to error out if pycrypto was not properly installed
+* Fixed a bug that would cause the alphanumeric shellcode injector to error out when selecting it through the payload menu (port.options exception)
+
 ~~~~~~~~~~~~~~~~
 version 4.4.2
 ~~~~~~~~~~~~~~~~
diff --git a/set b/set
index dacfecaaf..026e1f51e 100755
--- a/set
+++ b/set
@@ -9,6 +9,15 @@ import sys
 import shutil
 import re
 
+# check to see if we have python-pycrypto
+try:
+        from Crypto.Cipher import AES
+
+except ImportError:
+        print "[!] The python-pycrypto python module not installed. You will loose the ability to use multi-pyinjector."
+        pass
+
+
 #########################################
 # The Social-Engineer Toolkit (SET)     #
 # Written by: David Kennedy (ReL1K)     #
diff --git a/src/core/setcore.py b/src/core/setcore.py
index 0b7d801c4..49eae322c 100644
--- a/src/core/setcore.py
+++ b/src/core/setcore.py
@@ -18,14 +18,6 @@ import inspect
 import base64
 from src.core import dictionaries
 
-# check to see if we have python-pycrypto
-try:
-	from Crypto.Cipher import AES
-
-except ImportError:
-	print_error("The python-pycrypto python module not installed. You will loose the ability to use multi-pyinjector.")
-	pass
-
 # used to grab the true path for current working directory
 definepath = os.getcwd()
 
@@ -223,7 +215,7 @@ def print_error(message):
     print bcolors.RED + bcolors.BOLD + "[!] " + bcolors.ENDC + bcolors.RED + str(message) + bcolors.ENDC
 
 def get_version():
-    define_version = '4.4.2'
+    define_version = '4.4.3'
     return define_version
 
 class create_menu:
diff --git a/src/powershell/powershell.py b/src/powershell/powershell.py
index af460ff2b..f69c3e36b 100644
--- a/src/powershell/powershell.py
+++ b/src/powershell/powershell.py
@@ -46,8 +46,9 @@ if powershell_menu_choice != "99":
 	    filewrite.write(x86)
 	
 	    # grab port specifications
-	    fileopen = file("src/program_junk/port.options", "r")
-	    port = fileopen.read()
+	    if os.path.isfile("%s/src/program_junk/port.options" % (definepath)):
+		    fileopen = file("%s/src/program_junk/port.options" % (definepath), "r")
+		    port = fileopen.read()
 	
 	    choice = yesno_prompt("0","Do you want to start the listener now [yes/no]: ")
 	    if choice == 'NO':