diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-24 07:49:33 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-24 07:49:33 -0700 |
| commit | f484d1ef03bc548dde300a59c91474d82169b1be (patch) | |
| tree | f3d79d1c6a22db5b90a5810ffe1a432be9c912df /tests/hazmat/backends/test_openssl.py | |
| parent | 971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f (diff) | |
| parent | 2f2346344ae5561bc9b106cbb452efeebe3cdc45 (diff) | |
| download | cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.tar.gz cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.tar.bz2 cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.zip | |
Merge branch 'master' into verify-interfaces
Conflicts:
cryptography/hazmat/primitives/hmac.py
Diffstat (limited to 'tests/hazmat/backends/test_openssl.py')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 83494d0d..65113f1a 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 ) @@ -492,7 +493,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 |