diff options
| author | David Reid <dreid@dreid.org> | 2014-01-29 15:09:49 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-01-29 15:09:49 -0800 |
| commit | b2ff87737ca27a171ce0034e100841782d19dd7b (patch) | |
| tree | fde20b858f07d70a1dcc3f8f2b78bc02480630e5 /tests/conftest.py | |
| parent | babc4d50f42edc1e16c414e4008114d882b4c999 (diff) | |
| parent | 0b181182aef574c436a92a175937af32e54a2378 (diff) | |
| download | cryptography-b2ff87737ca27a171ce0034e100841782d19dd7b.tar.gz cryptography-b2ff87737ca27a171ce0034e100841782d19dd7b.tar.bz2 cryptography-b2ff87737ca27a171ce0034e100841782d19dd7b.zip | |
Merge pull request #520 from reaperhulk/pbkdf2-openssl
PBKDF2 Support (OpenSSL backend)
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index a9acb54a..ecad1b23 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,7 +2,7 @@ import pytest from cryptography.hazmat.backends import _ALL_BACKENDS from cryptography.hazmat.backends.interfaces import ( - HMACBackend, CipherBackend, HashBackend + HMACBackend, CipherBackend, HashBackend, PBKDF2HMACBackend ) from .utils import check_for_iface, check_backend_support, select_backends @@ -21,6 +21,7 @@ def pytest_runtest_setup(item): check_for_iface("hmac", HMACBackend, item) check_for_iface("cipher", CipherBackend, item) check_for_iface("hash", HashBackend, item) + check_for_iface("pbkdf2hmac", PBKDF2HMACBackend, item) check_backend_support(item) |