diff --git a/scapy/arch/__init__.py b/scapy/arch/__init__.py index 1e395ece89dc005da9bc076e71e452e87b3e64bb..ec3ad5051310e1b51fe83661168b40be78d5ef5f 100644 --- a/scapy/arch/__init__.py +++ b/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)) diff --git a/scapy/arch/linux.py b/scapy/arch/linux.py index 2f2651329c0b040b0bc412345fe80c8f5501dffe..d56d0429785f07501bbee4244e39cbd826bd73cb 100644 --- a/scapy/arch/linux.py +++ b/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) diff --git a/scapy/layers/dot11.py b/scapy/layers/dot11.py index 6e67c71aee1e5f14aa7d076634fb4da835099463..00b631d729ef3a464f51e735bc2ce431b641d17c 100644 --- a/scapy/layers/dot11.py +++ b/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):