diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-14 10:27:14 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-14 10:36:24 -0600 |
| commit | 7c5c9fedd513f4ef66b62fcf5fdcde8dc30fe532 (patch) | |
| tree | 1600ea1cdc548421f021bdc79a1251db8a7a0ebf /tests/hazmat | |
| parent | 2129d5035849c69f990a646ac76891d1a886be55 (diff) | |
| download | cryptography-7c5c9fedd513f4ef66b62fcf5fdcde8dc30fe532.tar.gz cryptography-7c5c9fedd513f4ef66b62fcf5fdcde8dc30fe532.tar.bz2 cryptography-7c5c9fedd513f4ef66b62fcf5fdcde8dc30fe532.zip | |
export interfaces from base in ciphers, update docs
Diffstat (limited to 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/backends/test_commoncrypto.py | 2 | ||||
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/hazmat/backends/test_commoncrypto.py b/tests/hazmat/backends/test_commoncrypto.py index c867804e..f7200016 100644 --- a/tests/hazmat/backends/test_commoncrypto.py +++ b/tests/hazmat/backends/test_commoncrypto.py @@ -9,8 +9,8 @@ import pytest from cryptography import utils from cryptography.exceptions import InternalError, _Reasons from cryptography.hazmat.backends import _available_backends +from cryptography.hazmat.primitives.ciphers import Cipher, CipherAlgorithm from cryptography.hazmat.primitives.ciphers.algorithms import AES -from cryptography.hazmat.primitives.ciphers.base import Cipher, CipherAlgorithm from cryptography.hazmat.primitives.ciphers.modes import CBC, GCM from ...utils import raises_unsupported_algorithm diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 878d71bb..6e3d80e9 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -21,11 +21,10 @@ from cryptography.hazmat.backends.openssl.backend import ( from cryptography.hazmat.backends.openssl.ec import _sn_to_elliptic_curve from cryptography.hazmat.primitives import hashes, interfaces from cryptography.hazmat.primitives.asymmetric import dsa, padding -from cryptography.hazmat.primitives.ciphers import Cipher -from cryptography.hazmat.primitives.ciphers.algorithms import AES -from cryptography.hazmat.primitives.ciphers.base import ( - BlockCipherAlgorithm, CipherAlgorithm +from cryptography.hazmat.primitives.ciphers import ( + BlockCipherAlgorithm, Cipher, CipherAlgorithm ) +from cryptography.hazmat.primitives.ciphers.algorithms import AES from cryptography.hazmat.primitives.ciphers.modes import CBC, CTR, Mode from ..primitives.fixtures_rsa import RSA_KEY_512 |