auto-t: update scapy imports for newer version
PATCH v2 1/1 auto-t: update scapy imports for newer version
Something changed between scapy versions and now the modules being imported don't exist.
--- autotests/testFrameFuzzing/fake_ap.py | 6 +++++- autotests/util/hwsim.py | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-)
autotests/testFrameFuzzing/fake_ap.py +5 -1
@@ -3,7 +3,11 @@ import sys import sys import os from scapy.layers.dot11 import * -from scapy.arch import str2mac, get_if_raw_hwaddr +from scapy.arch import str2mac +try: + from scapy.arch import get_if_raw_hwaddr +except: + from scapy.arch.unix import get_if_raw_hwaddr from time import time, sleep from threading import Thread
autotests/util/hwsim.py +13 -4
@@ -7,7 +7,10 @@ from weakref import WeakValueDictionary from abc import ABCMeta, abstractmethod from enum import Enum from scapy.all import * -from scapy.contrib.wpa_eapol import WPA_key +try: + from scapy.contrib.wpa_eapol import WPA_key +except: + from scapy.layers.eap import EAPOL_KEY import iwd from config import ctx
@@ -444,9 +447,15 @@ class Hwsim(iwd.AsyncOpAbstract): # NOTE: Expected key_info is 0x008a, with the install flag # this becomes 0x00ca. - eapol = WPA_key( descriptor_type = 2, - key_info = 0x00ca, # Includes an invalid install flag! - replay_counter = struct.pack(">Q", 100)) + try: + eapol = WPA_key( descriptor_type = 2, + key_info = 0x00ca, # Includes an invalid install flag! + replay_counter = struct.pack(">Q", 100)) + except: + eapol = EAPOL_KEY( key_descriptor_type = 2, + install = 1, + key_ack = 1, + key_replay_counter = 1) frame /= LLC()/SNAP()/EAPOL(version="802.1X-2004", type="EAPOL-Key") frame /= eapol
Signature · 1 line
2.34.1
Denis Kenzior
AppliedHi James,
Quoted 7 lines · James Prestwood
Something changed between scapy versions and now the modules being imported don't exist.
--- autotests/testFrameFuzzing/fake_ap.py | 6 +++++- autotests/util/hwsim.py | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-)
Applied, thanks.
Regards,
-Denis