diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-08 12:43:02 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-08 12:43:02 -0700 |
| commit | e53677a149b646deb2be1d6ffbd3e27a960b2f8c (patch) | |
| tree | 0aeea194f1f814967167714eb8849c682a681d06 | |
| parent | f0ca2e8bf0eaaba32ea0fe1a608c2a5c6348f5fa (diff) | |
| download | cryptography-e53677a149b646deb2be1d6ffbd3e27a960b2f8c.tar.gz cryptography-e53677a149b646deb2be1d6ffbd3e27a960b2f8c.tar.bz2 cryptography-e53677a149b646deb2be1d6ffbd3e27a960b2f8c.zip | |
fixes
| -rw-r--r-- | cryptography/utils.py | 1 | ||||
| -rw-r--r-- | pytest.ini | 1 | ||||
| -rw-r--r-- | tests/conftest.py | 4 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_serialization.py | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/cryptography/utils.py b/cryptography/utils.py index 9c574085..f4c2e3cb 100644 --- a/cryptography/utils.py +++ b/cryptography/utils.py @@ -17,6 +17,7 @@ import sys DeprecatedIn05 = DeprecationWarning +DeprecatedIn06 = PendingDeprecationWarning def register_interface(iface): @@ -12,3 +12,4 @@ markers = pkcs8_serialization: this test requires a backend providing PKCS8SerializationBackend supported: parametrized test requiring only_if and skip_message elliptic: this test requires a backend providing EllipticCurveBackend + pem_serialization: this test requires a backend providing PEMSerializationBackend diff --git a/tests/conftest.py b/tests/conftest.py index af146386..b7981c9d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -18,7 +18,8 @@ import pytest from cryptography.hazmat.backends import _available_backends from cryptography.hazmat.backends.interfaces import ( CMACBackend, CipherBackend, DSABackend, EllipticCurveBackend, HMACBackend, - HashBackend, PBKDF2HMACBackend, PKCS8SerializationBackend, RSABackend, + HashBackend, PBKDF2HMACBackend, PEMSerializationBackend, + PKCS8SerializationBackend, RSABackend, TraditionalOpenSSLSerializationBackend ) from .utils import check_backend_support, check_for_iface, select_backends @@ -48,6 +49,7 @@ def pytest_runtest_setup(item): ) check_for_iface("pkcs8_serialization", PKCS8SerializationBackend, item) check_for_iface("elliptic", EllipticCurveBackend, item) + check_for_iface("pem_serialization", PEMSerializationBackend, item) check_backend_support(item) diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index e960878b..9333a6bd 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -22,7 +22,7 @@ import pytest from cryptography.exceptions import _Reasons from cryptography.hazmat.primitives import interfaces from cryptography.hazmat.primitives.serialization import ( - load_pem_private_key, load_pem_pkcs8_private_key, + load_pem_pkcs8_private_key, load_pem_private_key, load_pem_traditional_openssl_private_key ) |