diff options
| author | gpotter2 <10530980+gpotter2@users.noreply.github.com> | 2024-05-12 22:55:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-12 22:55:02 +0200 |
| commit | f17e8da65d9299d6dbc84b427aaf7761aff31355 (patch) | |
| tree | dedd5ee0df6b1a5c63707dd3e154bce31d27832a | |
| parent | ecfeb1427ff1878eb7e89a5daf3ce2de2f38ab55 (diff) | |
| download | scapy-upstream-master.tar.gz | |
Fix cryptography > 43.0 deprecation warning in TLS (#4383)upstream-master
| -rw-r--r-- | scapy/layers/tls/crypto/cipher_block.py | 25 | ||||
| -rw-r--r-- | scapy/layers/tls/crypto/cipher_stream.py | 9 |
2 files changed, 26 insertions, 8 deletions
diff --git a/scapy/layers/tls/crypto/cipher_block.py b/scapy/layers/tls/crypto/cipher_block.py index ee64fe1b..cca1387c 100644 --- a/scapy/layers/tls/crypto/cipher_block.py +++ b/scapy/layers/tls/crypto/cipher_block.py @@ -17,10 +17,21 @@ if conf.crypto_valid: from cryptography.utils import ( CryptographyDeprecationWarning, ) - from cryptography.hazmat.primitives.ciphers import (Cipher, algorithms, modes, # noqa: E501 - BlockCipherAlgorithm, - CipherAlgorithm) + from cryptography.hazmat.primitives.ciphers import ( + BlockCipherAlgorithm, + Cipher, + CipherAlgorithm, + algorithms, + modes, + ) from cryptography.hazmat.backends.openssl.backend import backend + try: + # cryptography > 43.0 + from cryptography.hazmat.decrepit.ciphers import ( + algorithms as decrepit_algorithms, + ) + except ImportError: + decrepit_algorithms = algorithms _tls_block_cipher_algs = {} @@ -133,7 +144,7 @@ _sslv2_block_cipher_algs = {} if conf.crypto_valid: class Cipher_DES_CBC(_BlockCipher): - pc_cls = algorithms.TripleDES + pc_cls = decrepit_algorithms.TripleDES pc_cls_mode = modes.CBC block_size = 8 key_len = 8 @@ -151,7 +162,7 @@ if conf.crypto_valid: key_len = 5 class Cipher_3DES_EDE_CBC(_BlockCipher): - pc_cls = algorithms.TripleDES + pc_cls = decrepit_algorithms.TripleDES pc_cls_mode = modes.CBC block_size = 8 key_len = 24 @@ -165,13 +176,13 @@ if conf.crypto_valid: category=CryptographyDeprecationWarning) class Cipher_IDEA_CBC(_BlockCipher): - pc_cls = algorithms.IDEA + pc_cls = decrepit_algorithms.IDEA pc_cls_mode = modes.CBC block_size = 8 key_len = 16 class Cipher_SEED_CBC(_BlockCipher): - pc_cls = algorithms.SEED + pc_cls = decrepit_algorithms.SEED pc_cls_mode = modes.CBC block_size = 16 key_len = 16 diff --git a/scapy/layers/tls/crypto/cipher_stream.py b/scapy/layers/tls/crypto/cipher_stream.py index bbd6bbd0..5c95fadd 100644 --- a/scapy/layers/tls/crypto/cipher_stream.py +++ b/scapy/layers/tls/crypto/cipher_stream.py @@ -14,6 +14,13 @@ from scapy.layers.tls.crypto.common import CipherError if conf.crypto_valid: from cryptography.hazmat.primitives.ciphers import Cipher, algorithms from cryptography.hazmat.backends import default_backend + try: + # cryptography > 43.0 + from cryptography.hazmat.decrepit.ciphers import ( + algorithms as decrepit_algorithms, + ) + except ImportError: + decrepit_algorithms = algorithms _tls_stream_cipher_algs = {} @@ -103,7 +110,7 @@ class _StreamCipher(metaclass=_StreamCipherMetaclass): if conf.crypto_valid: class Cipher_RC4_128(_StreamCipher): - pc_cls = algorithms.ARC4 + pc_cls = decrepit_algorithms.ARC4 key_len = 16 class Cipher_RC4_40(Cipher_RC4_128): |