Merge branch 'master' of https://github.com/PowerShellEmpire/Empire into LostAgentDetection

changelog

@@ -0,0 +1,15 @@
+8/10/2015
+---------
+-Fixed tab completion of usestager module
+-Added dependencies for Ubuntu 14.04
+-Fixed IP Whitelisting set from file
+
+8/9/2015
+----------
+-Fixed flaw in crypto allowing a DOS condition. 
+-Added authentication to the AES crypto scheme to verify integrity of messages
+
+8/6/2015
+-----------
+-Initial release. All components released
+-Commited path fix to correct bug in certain modules

lib/common/empire.py

@@ -453,7 +453,7 @@ class MainMenu(cmd.Cmd):
                     f = open(parts[1], 'r')
                     ipData = f.read()
                     f.close()
-                    self.agents.ipBlackList = helpers.generate_ip_list(ipData)
+                    self.agents.ipWhiteList = helpers.generate_ip_list(ipData)
                 else:
                     self.agents.ipWhiteList = helpers.generate_ip_list(",".join(parts[1:]))
             elif parts[0].lower() == "ip_blacklist":
@@ -526,7 +526,7 @@ class MainMenu(cmd.Cmd):
 
         stagers = self.stagers.stagers.keys()
 
-        if line.split(" ")[1].lower() in stagers:
+        if (line.split(" ")[1].lower() in stagers) and line.endswith(" "):
             # if we already have a stager name, tab-complete listener names
             listenerNames = self.listeners.get_listener_names()
 

setup/install.sh

@@ -2,6 +2,13 @@
 
 apt-get install python-pip
 
+#ubuntu 14.04 LTS dependencies
+apt-get install python-dev
+apt-get install python-m2crypto
+apt-get install swig
+pip install pycrypto
+
+#kali dependencies
 pip install iptools
 pip install pydispatcher