From 33574c6ee06c59d22721c7a7acb503c1bef08289 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 8 Jul 2017 11:09:53 -0500 Subject: change chacha20poly1305_supported to aead_cipher_supported (#3762) --- src/cryptography/hazmat/backends/openssl/backend.py | 6 +++++- src/cryptography/hazmat/primitives/ciphers/aead.py | 2 +- tests/hazmat/primitives/test_aead.py | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index c63ea32d..98c79be6 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -1934,7 +1934,11 @@ class Backend(object): self, b"chacha20-poly1305", key, nonce, data, associated_data, 16 ) - def chacha20poly1305_supported(self): + def aead_cipher_supported(self, cls): + from cryptography.hazmat.primitives.ciphers.aead import ( + ChaCha20Poly1305 + ) + assert cls is ChaCha20Poly1305 return ( self._lib.EVP_get_cipherbyname(b"chacha20-poly1305") != self._ffi.NULL diff --git a/src/cryptography/hazmat/primitives/ciphers/aead.py b/src/cryptography/hazmat/primitives/ciphers/aead.py index e89c6979..8b2e20c4 100644 --- a/src/cryptography/hazmat/primitives/ciphers/aead.py +++ b/src/cryptography/hazmat/primitives/ciphers/aead.py @@ -12,7 +12,7 @@ from cryptography.hazmat.backends.openssl.backend import backend class ChaCha20Poly1305(object): def __init__(self, key): - if not backend.chacha20poly1305_supported(): + if not backend.aead_cipher_supported(type(self)): raise exceptions.UnsupportedAlgorithm( "ChaCha20Poly1305 is not supported by this version of OpenSSL", exceptions._Reasons.UNSUPPORTED_CIPHER diff --git a/tests/hazmat/primitives/test_aead.py b/tests/hazmat/primitives/test_aead.py index aea2380b..bf1e8208 100644 --- a/tests/hazmat/primitives/test_aead.py +++ b/tests/hazmat/primitives/test_aead.py @@ -20,7 +20,7 @@ from ...utils import ( @pytest.mark.supported( only_if=lambda backend: ( - not backend.chacha20poly1305_supported() + not backend.aead_cipher_supported(ChaCha20Poly1305) ), skip_message="Requires OpenSSL without ChaCha20Poly1305 support" ) @@ -31,7 +31,7 @@ def test_chacha20poly1305_unsupported_on_older_openssl(backend): @pytest.mark.supported( - only_if=lambda backend: backend.chacha20poly1305_supported(), + only_if=lambda backend: backend.aead_cipher_supported(ChaCha20Poly1305), skip_message="Does not support ChaCha20Poly1305" ) @pytest.mark.requires_backend_interface(interface=CipherBackend) -- cgit v1.2.3