From 7da4668f3a3827c6720173153b1aeb5a222f66ff Mon Sep 17 00:00:00 2001 From: "Guido Paliot (EUROSEC)" Date: Tue, 18 Aug 2020 13:35:40 +0200 Subject: [PATCH] Fixed "ImportError: cannot import name Raw" when using scapy >=2.40 --- sap_ms_betrusted.py | 6 +++++- sap_ms_dispatcher_mitm.py | 6 +++++- sap_ms_monitor_storage.py | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sap_ms_betrusted.py b/sap_ms_betrusted.py index d17db2f..00c53b0 100755 --- a/sap_ms_betrusted.py +++ b/sap_ms_betrusted.py @@ -30,7 +30,11 @@ from scapy.sendrecv import sniff from scapy.utils import hexdump,inet_ntoa,inet_aton from scapy.packet import bind_layers -from scapy.layers.inet import TCP,Raw +from scapy.layers.inet import TCP +try: + from scapy.layers.inet import Raw +except ImportError: + from scapy.packet import Raw from scapy.config import conf from ansicolor import red,green,blue,yellow,cyan,magenta from pprint import pprint diff --git a/sap_ms_dispatcher_mitm.py b/sap_ms_dispatcher_mitm.py index 186436c..14dac68 100755 --- a/sap_ms_dispatcher_mitm.py +++ b/sap_ms_dispatcher_mitm.py @@ -29,7 +29,11 @@ from scapy.sendrecv import sniff from scapy.utils import hexdump,inet_ntoa,inet_aton from scapy.packet import bind_layers -from scapy.layers.inet import TCP,Raw +from scapy.layers.inet import TCP +try: + from scapy.layers.inet import Raw +except ImportError: + from scapy.packet import Raw from scapy.config import conf from ansicolor import red,green,blue,yellow,cyan,magenta from pprint import pprint diff --git a/sap_ms_monitor_storage.py b/sap_ms_monitor_storage.py index f521954..58a2c3a 100755 --- a/sap_ms_monitor_storage.py +++ b/sap_ms_monitor_storage.py @@ -26,7 +26,11 @@ from scapy.supersocket import StreamSocket from scapy.utils import hexdump,inet_ntoa,inet_aton from scapy.packet import bind_layers -from scapy.layers.inet import TCP,Raw +from scapy.layers.inet import TCP +try: + from scapy.layers.inet import Raw +except ImportError: + from scapy.packet import Raw from scapy.config import conf from ansicolor import red,green,blue,yellow,cyan,magenta from pprint import pprint