From 2eb0979c5df69a1fe7be4a3c31d2dd74d1c111f1 Mon Sep 17 00:00:00 2001 From: gpotter2 Date: Thu, 12 Oct 2017 18:50:45 +0200 Subject: [PATCH] Fix Cryptography import (2.1+) --- scapy/contrib/macsec.py | 1 - scapy/layers/ipsec.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scapy/contrib/macsec.py b/scapy/contrib/macsec.py index b038d3846..bb4438492 100644 --- a/scapy/contrib/macsec.py +++ b/scapy/contrib/macsec.py @@ -22,7 +22,6 @@ from scapy.layers.inet6 import IPv6 if conf.crypto_valid: from cryptography.exceptions import InvalidTag from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives import interfaces from cryptography.hazmat.primitives.ciphers import ( Cipher, algorithms, diff --git a/scapy/layers/ipsec.py b/scapy/layers/ipsec.py index d6685b903..69e7ae3b0 100644 --- a/scapy/layers/ipsec.py +++ b/scapy/layers/ipsec.py @@ -160,7 +160,6 @@ class _ESPPlain(Packet): if conf.crypto_valid: from cryptography.exceptions import InvalidTag from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives import interfaces from cryptography.hazmat.primitives.ciphers import ( Cipher, algorithms, @@ -169,7 +168,7 @@ if conf.crypto_valid: else: log_loading.info("Can't import python-cryptography v1.7+. " "Disabled IPsec encryption/authentication.") - InvalidTag = default_backend = interfaces = None + InvalidTag = default_backend = None Cipher = algorithms = modes = None #------------------------------------------------------------------------------