diff --git a/core/netcreds/NetCreds.py b/core/netcreds/NetCreds.py index 328974b..451729b 100644 --- a/core/netcreds/NetCreds.py +++ b/core/netcreds/NetCreds.py @@ -17,7 +17,7 @@ from urllib import unquote # shut up scapy logging.getLogger("scapy.runtime").setLevel(logging.ERROR) -from mitmflib.scapy.all import * +from scapy.all import * conf.verb=0 mitmf_logger = logging.getLogger('mitmf') diff --git a/core/poisoners/arp/ARPWatch.py b/core/poisoners/arp/ARPWatch.py index 55faf04..10470e5 100644 --- a/core/poisoners/arp/ARPWatch.py +++ b/core/poisoners/arp/ARPWatch.py @@ -3,7 +3,7 @@ import os import sys import threading -from mitmflib.scapy.all import * +from scapy.all import * from core.utils import shutdown mitmf_logger = logging.getLogger('mitmf') diff --git a/core/poisoners/arp/ARPpoisoner.py b/core/poisoners/arp/ARPpoisoner.py index 4e896b7..8816665 100644 --- a/core/poisoners/arp/ARPpoisoner.py +++ b/core/poisoners/arp/ARPpoisoner.py @@ -5,7 +5,7 @@ from traceback import print_exc from netaddr import IPNetwork, IPRange, IPAddress, AddrFormatError from time import sleep from core.utils import shutdown -from mitmflib.scapy.all import * +from scapy.all import * mitmf_logger = logging.getLogger('mitmf') diff --git a/core/poisoners/dhcp/DHCPpoisoner.py b/core/poisoners/dhcp/DHCPpoisoner.py index d3169cc..aa23cc8 100644 --- a/core/poisoners/dhcp/DHCPpoisoner.py +++ b/core/poisoners/dhcp/DHCPpoisoner.py @@ -4,7 +4,7 @@ import binascii import random logging.getLogger("scapy.runtime").setLevel(logging.ERROR) #Gets rid of IPV6 Error when importing scapy -from mitmflib.scapy.all import * +from scapy.all import * mitmf_logger = logging.getLogger('mitmf') diff --git a/core/poisoners/icmp/ICMPpoisoner.py b/core/poisoners/icmp/ICMPpoisoner.py index c77d1bc..a23bf4b 100644 --- a/core/poisoners/icmp/ICMPpoisoner.py +++ b/core/poisoners/icmp/ICMPpoisoner.py @@ -30,7 +30,7 @@ from time import sleep #from netfilterqueue import NetfilterQueue logging.getLogger("scapy.runtime").setLevel(logging.ERROR) #Gets rid of IPV6 Error when importing scapy -from mitmflib.scapy.all import * +from scapy.all import * mitmf_logger = logging.getLogger('mitmf') diff --git a/core/utils.py b/core/utils.py index f90d51d..42a9aa2 100644 --- a/core/utils.py +++ b/core/utils.py @@ -26,7 +26,7 @@ import re import sys logging.getLogger("scapy.runtime").setLevel(logging.ERROR) #Gets rid of IPV6 Error when importing scapy -from mitmflib.scapy.all import get_if_addr, get_if_hwaddr +from scapy.all import get_if_addr, get_if_hwaddr from core.sergioproxy.ProxyPlugins import ProxyPlugins mitmf_logger = logging.getLogger('mitmf') diff --git a/plugins/Spoof.py b/plugins/Spoof.py index fef8cd9..37379fd 100644 --- a/plugins/Spoof.py +++ b/plugins/Spoof.py @@ -25,7 +25,7 @@ from core.servers.dns.DNSchef import DNSChef from core.poisoners.dhcp.DHCPpoisoner import DHCPpoisoner from core.poisoners.icmp.ICMPpoisoner import ICMPpoisoner from plugins.plugin import Plugin -from mitmflib.scapy.all import * +from scapy.all import * class Spoof(Plugin): name = "Spoof" diff --git a/requirements.txt b/requirements.txt index 0c9da76..853e415 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ Twisted requests netaddr +scapy msgpack-python configobj mitmflib