Added Support for Multiple Scapy Version

Author: root

wifibroot.py

@@ -157,7 +157,7 @@ def __init__(self, iface, bssid=None, essid=None):
 		self.bssid = bssid
 		self.essid = essid
 		self.shift = Shifter(self.iface1.iface, self.bssid, self.essid, V__)
-		self.sig = signal(SIGINT, self.break_shifter)
+		signal(SIGINT, self.break_shifter)
 		self.aps()
 
 	def aps(self):
@@ -179,7 +179,6 @@ def break_shifter(self, sig, frame):
 			del self.screen
 
 		__HEADERS = [color.BOLD+'NO', 'ESSID', 'PWR', 'ENC', 'CIPHER', 'AUTH', 'CH', 'BSSID'+color.END]
-		self.sig = signal(SIGINT, lambda sig, frame: sys.exit())
 		tabulator__ = []
 		###
 		__sig_LIST = []
@@ -199,6 +198,7 @@ def break_shifter(self, sig, frame):
 			tabulator__.append([ap['count'], ap['essid'], ap['pwr'], ap['auth'], ap['cipher'], \
 					ap['psk'], ap['channel'], ap['bssid'].upper()])
 		print "\n"+tabulate(tabulator__, headers=__HEADERS)+"\n"
+		os.kill(os.getpid(), SIGINT)
 
 class Phazer:
 
@@ -279,15 +279,15 @@ def h_crack(self, ap, p_to_h):
 		pols = gen.get_pols()
 		self.call_PSK(pols, ap['essid'], ap['auth'])
 
-	def d_h_crack(self, ap):
+	def d_h_crack(self, ap, timeout):
 		global WRITE__
 
 		y_h = False
 
 		while not y_h:
 
-			pull.up('Locating Clients from AP to generate handshake. Sleeping for 20 Seconds. ')
-			self.sniper = Sniper(self.iface, ap['bssid'], ap['essid'], ap['channel'])
+			pull.up('Locating Clients from AP to generate handshake. Sleeping for %d Seconds. ' % timeout)
+			self.sniper = Sniper(self.iface, ap['bssid'], ap['essid'], ap['channel'], timeout)
 			self.sniper.cl_generator()
 			cls__ = self.sniper.clients()
 			pull.info('Clients Detected. Number of Connected Users: %d' % len(cls__))
@@ -353,6 +353,7 @@ def main():
 	parser.add_option('-d', '--dictionary', dest='dictionary', help="Dictionary containing Passwords")
 	parser.add_option('', '--newhandshake', dest='newhandshake', default=False, action="store_true", help="Discard previous handshake and capture new one. ")
 	parser.add_option('-n', '--nowrite', dest="write", default=True, action="store_false", help="Do not Save the Captured Handshakes")
+	parser.add_option('-t', '--timeout', dest="timeout", default=20, help="Specify timeout for locating target clients. ")
 	parser.add_option('-v', '--verbose', dest="verbose", default=False, action="store_true", help="Print hashes and verbose messages. ")
 
 	(options, args) = parser.parse_args()
@@ -410,6 +411,7 @@ def main():
 
 	phaser = Phazer(sniffer)
 	target = phaser.get_input()
+	signal(SIGINT, lambda sig, frame: sys.exit())
 	pull.info("You've choosed \"%s\" with encryption %s" % (target['essid'], target['auth']))
 	if not phaser.verify_h_crack(target['bssid'])[0] or NEW_HAND == True:
 		if NEW_HAND:
@@ -418,7 +420,7 @@ def main():
 				pull.delete('Discarded Previous Handshake for "%s"' % (color.BOLD+target['essid']+color.END))
 			else:
 				pull.info('Attempting to Capture new handshake for "%s"' % (color.BOLD+target['essid']+color.END))
-		phaser.d_h_crack(target)
+		phaser.d_h_crack(target, int(options.timeout))
 	else:
 		pull.use("We've already got the handshake for this network. Attempting to Crack it.")
 		phaser.h_crack(target, phaser.verify_h_crack(target['bssid'])[1])

wireless/cracker.py

@@ -1,8 +1,7 @@
 
 from scapy.layers.dot11 import Dot11
 from scapy.layers.dot11 import Dot11Beacon
-from scapy.layers.dot11 import Raw
-from scapy.layers.dot11 import EAPOL
+from scapy.layers.dot11 import Raw    
 from pull import Pully
 from pbkdf2 import PBKDF2
 from screen import Display
@@ -14,7 +13,10 @@
 import sys
 import time
 import string
-
+try:
+	from scapy.layers.dot11 import EAPOL
+except ImportError:                                     # Support for new versions
+	from scapy.layers.eap import EAPOL 
 
 pull = Pully()
 

wireless/shifter.py

@@ -1,10 +1,18 @@
 # Shifter.py
 
-import re
-from scapy.layers.dot11 import EAPOL, Dot11Beacon, Dot11, Dot11Elt
+from scapy.layers.dot11 import Dot11Beacon
+from scapy.layers.dot11 import Dot11
+from scapy.layers.dot11 import Dot11Elt
 from scapy.layers.dot11 import RadioTap
-from scapy.all import sniff, conf
-from scapy.utils import PcapWriter, rdpcap
+from scapy.sendrecv import sniff
+from scapy.config import conf
+from scapy.utils import PcapWriter
+from scapy.utils import rdpcap
+import re
+try:
+	from scapy.layers.dot11 import EAPOL
+except ImportError:
+	from scapy.layers.eap import EAPOL
 
 class Shifter:
 

wireless/sniper.py

@@ -1,12 +1,22 @@
 
-from scapy.all import *
+from scapy.sendrecv import sniff
+from scapy.sendrecv import sendp
+from scapy.config import conf
+from scapy.layers.dot11 import Dot11
+from scapy.layers.dot11 import RadioTap
+from scapy.layers.dot11 import Raw
+from scapy.layers.dot11 import Dot11Deauth
 import signal
 import sys
 import time
 import threading
 import exceptions
 import binascii
 import os
+try:
+	from scapy.layers.dot11 import EAPOL
+except ImportError:
+	from scapy.layers.eap import EAPOL
 
 class Sniper:
 
@@ -17,12 +27,13 @@ class Sniper:
 	__c_TGT = ''
 	out__ = ['33:33:00:00:00:16', '33:33:ff:9d:df:fd', 'ff:ff:ff:ff:ff:ff', ]
 
-	def __init__(self, iface_instance, bssid, essid, channel):
+	def __init__(self, iface_instance, bssid, essid, channel, timeout):
 		self.iface_instance = iface_instance
 		self.iface = self.iface_instance.iface
 		self.bssid = bssid
 		self.essid = essid
 		self.ch = channel
+		self.timeout = timeout
 		self.channel_shifter = self.channel_shifter(self.ch)
 
 	def __str__(self):
@@ -40,7 +51,7 @@ def sniff_breaker(self, sig, frame):
 	def cl_generator(self):
 		signal.signal(signal.SIGINT, self.sniff_breaker)
 		try:
-			sniff(iface=self.iface, prn=self.cl_generator_replay, timeout=20)
+			sniff(iface=self.iface, prn=self.cl_generator_replay, timeout=self.timeout)
 		except ValueError:
 			pass
 		finally: