Remove usage of cryptography's register_interface

secdev · Sep 10, 2022 · bb1ed01 · bb1ed01
1 parent 68f2b5d
commit bb1ed01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/scapy/layers/tls/crypto/cipher_block.py b/scapy/layers/tls/crypto/cipher_block.py
@@ -16,7 +16,6 @@
 
 if conf.crypto_valid:
     from cryptography.utils import (
-        register_interface,
         CryptographyDeprecationWarning,
     )
     from cryptography.hazmat.primitives.ciphers import (Cipher, algorithms, modes,  # noqa: E501
@@ -193,9 +192,7 @@ class Cipher_SEED_CBC(_BlockCipher):
 # silently not declared, and the corresponding suites will have 'usable' False.
 
 if conf.crypto_valid:
-    @register_interface(BlockCipherAlgorithm)
-    @register_interface(CipherAlgorithm)
-    class _ARC2(object):
+    class _ARC2(BlockCipherAlgorithm, CipherAlgorithm):
         name = "RC2"
         block_size = 64
         key_sizes = frozenset([128])

diff --git a/scapy/layers/tls/crypto/pkcs1.py b/scapy/layers/tls/crypto/pkcs1.py
@@ -19,7 +19,6 @@
 from scapy.config import conf, crypto_validator
 from scapy.error import warning
 if conf.crypto_valid:
-    from cryptography import utils
     from cryptography.exceptions import InvalidSignature, UnsupportedAlgorithm
     from cryptography.hazmat.backends import default_backend
     from cryptography.hazmat.primitives import hashes
@@ -96,8 +95,7 @@ def _legacy_pkcs1_v1_5_encode_md5_sha1(M, emLen):
 if conf.crypto_valid:
 
     # first, we add the "md5-sha1" hash from openssl to python-cryptography
-    @utils.register_interface(HashAlgorithm)
-    class MD5_SHA1(object):
+    class MD5_SHA1(HashAlgorithm):
         name = "md5-sha1"
         digest_size = 36
         block_size = 64