Changeset 903:8817bc10bca4

Show
Ignore:
Timestamp:
09/03/08 21:11:40 (4 months ago)
Author:
Phil <phil@secdev.org>
Message:

Fixed some imports

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • scapy/arch/__init__.py

    r894 r903  
    2222    log_loading.info("Can't import PyX. Won't be able to use psdump() or pdfdump().") 
    2323    PYX=0 
    24  
    25 try: 
    26     from Crypto.Cipher import ARC4 
    27 except ImportError: 
    28     log_loading.info("Can't import python Crypto lib. Won't be able to decrypt WEP.") 
    29  
    30  
    3124 
    3225 

  • scapy/arch/linux.py

    r900 r903  
    1313from scapy.data import * 
    1414from scapy.supersocket import SuperSocket 
     15import scapy.arch 
    1516 
    1617 
    …… 
    109110        return 
    110111    try: 
    111         f = os.popen("%s -i %s -ddd -s 1600 '%s'" % (config.conf.prog.tcpdump,config.conf.iface,filter)) 
     112        f = os.popen("%s -i %s -ddd -s 1600 '%s'" % (conf.prog.tcpdump,conf.iface,filter)) 
    112113    except OSError,msg: 
    113114        log_interactive.warning("Failed to execute tcpdump: (%s)") 
    …… 
    123124    # XXX. Argl! We need to give the kernel a pointer on the BPF, 
    124125    # python object header seems to be 20 bytes. 36 bytes for x86 64bits arch. 
    125     if X86_64: 
     126    if scapy.arch.X86_64: 
    126127        bpfh = struct.pack("HL", nb, id(bpf)+36) 
    127128    else: 

  • scapy/layers/dot11.py

    r862 r903  
    1010from scapy.plist import PacketList 
    1111from scapy.layers.l2 import * 
     12 
     13 
     14try: 
     15    from Crypto.Cipher import ARC4 
     16except ImportError: 
     17    log_loading.info("Can't import python Crypto lib. Won't be able to decrypt WEP.") 
     18 
    1219 
    1320### Fields