aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/backends
diff options
context:
space:
mode:
Diffstat (limited to 'tests/hazmat/backends')
-rw-r--r--tests/hazmat/backends/test_multibackend.py14
-rw-r--r--tests/hazmat/backends/test_openssl.py3
2 files changed, 9 insertions, 8 deletions
diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py
index c50b6cf6..39c03146 100644
--- a/tests/hazmat/backends/test_multibackend.py
+++ b/tests/hazmat/backends/test_multibackend.py
@@ -38,15 +38,15 @@ class DummyCipherBackend(object):
def __init__(self, supported_ciphers):
self._ciphers = supported_ciphers
- def cipher_supported(self, algorithm, mode):
- return (type(algorithm), type(mode)) in self._ciphers
+ def cipher_supported(self, cipher, mode):
+ return (type(cipher), type(mode)) in self._ciphers
- def create_symmetric_encryption_ctx(self, algorithm, mode):
- if not self.cipher_supported(algorithm, mode):
+ def create_symmetric_encryption_ctx(self, cipher, mode):
+ if not self.cipher_supported(cipher, mode):
raise UnsupportedAlgorithm("", _Reasons.UNSUPPORTED_CIPHER)
- def create_symmetric_decryption_ctx(self, algorithm, mode):
- if not self.cipher_supported(algorithm, mode):
+ def create_symmetric_decryption_ctx(self, cipher, mode):
+ if not self.cipher_supported(cipher, mode):
raise UnsupportedAlgorithm("", _Reasons.UNSUPPORTED_CIPHER)
@@ -92,7 +92,7 @@ class DummyPBKDF2HMACBackend(object):
@utils.register_interface(RSABackend)
class DummyRSABackend(object):
- def generate_rsa_private_key(self, public_exponent, private_key):
+ def generate_rsa_private_key(self, public_exponent, key_size):
pass
def rsa_padding_supported(self, padding):
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index 3bea413a..39708f82 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -24,6 +24,7 @@ import pytest
from cryptography import utils
from cryptography.exceptions import InternalError, _Reasons
+from cryptography.hazmat.backends.interfaces import EllipticCurveBackend
from cryptography.hazmat.backends.openssl.backend import (
Backend, backend
)
@@ -489,7 +490,7 @@ class TestOpenSSLEllipticCurve(object):
_sn_to_elliptic_curve(backend, b"fake")
-@pytest.mark.elliptic
+@pytest.mark.requires_backend_interface(interface=EllipticCurveBackend)
class TestDeprecatedECBackendMethods(object):
def test_elliptic_curve_private_key_from_numbers(self):
d = 5634846038258869671139984276180670841223409490498798721258