Fixed some imports

scapy/arch/__init__.py

@@ -22,13 +22,6 @@ except ImportError:
     log_loading.info("Can't import PyX. Won't be able to use psdump() or pdfdump().")
     PYX=0
 
-try:
-    from Crypto.Cipher import ARC4
-except ImportError:
-    log_loading.info("Can't import python Crypto lib. Won't be able to decrypt WEP.")
-
-
-
 
 def str2mac(s):
     return ("%02x:"*6)[:-1] % tuple(map(ord, s)) 

scapy/arch/linux.py

@@ -12,6 +12,7 @@ import scapy.utils
 from scapy.config import conf
 from scapy.data import *
 from scapy.supersocket import SuperSocket
+import scapy.arch
 
 
 
@@ -108,7 +109,7 @@ def attach_filter(s, filter):
     if not TCPDUMP:
         return
     try:
-        f = os.popen("%s -i %s -ddd -s 1600 '%s'" % (config.conf.prog.tcpdump,config.conf.iface,filter))
+        f = os.popen("%s -i %s -ddd -s 1600 '%s'" % (conf.prog.tcpdump,conf.iface,filter))
     except OSError,msg:
         log_interactive.warning("Failed to execute tcpdump: (%s)")
         return
@@ -122,7 +123,7 @@ def attach_filter(s, filter):
 
     # XXX. Argl! We need to give the kernel a pointer on the BPF,
     # python object header seems to be 20 bytes. 36 bytes for x86 64bits arch.
-    if X86_64:
+    if scapy.arch.X86_64:
         bpfh = struct.pack("HL", nb, id(bpf)+36)
     else:
         bpfh = struct.pack("HI", nb, id(bpf)+20)  

scapy/layers/dot11.py

@@ -10,6 +10,13 @@ from scapy.fields import *
 from scapy.plist import PacketList
 from scapy.layers.l2 import *
 
+
+try:
+    from Crypto.Cipher import ARC4
+except ImportError:
+    log_loading.info("Can't import python Crypto lib. Won't be able to decrypt WEP.")
+
+
 ### Fields
 
 class Dot11AddrMACField(MACField):