diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2015-02-16 15:59:50 +0000 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2015-02-16 15:59:50 +0000 |
| commit | 99c1b803aeb2260d8dbc131aca608276a714285c (patch) | |
| tree | 979666c5fb3b4aca15549bb0bff09487956cacc7 /tests/hazmat/backends/test_commoncrypto.py | |
| parent | ebc1717d73eaccffeddc32cee9eb0ad5936f7a4b (diff) | |
| parent | 7c5c9fedd513f4ef66b62fcf5fdcde8dc30fe532 (diff) | |
| download | cryptography-99c1b803aeb2260d8dbc131aca608276a714285c.tar.gz cryptography-99c1b803aeb2260d8dbc131aca608276a714285c.tar.bz2 cryptography-99c1b803aeb2260d8dbc131aca608276a714285c.zip | |
Merge pull request #1659 from reaperhulk/move-cipher-interfaces
Move cipher and mode interfaces
Diffstat (limited to 'tests/hazmat/backends/test_commoncrypto.py')
| -rw-r--r-- | tests/hazmat/backends/test_commoncrypto.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/hazmat/backends/test_commoncrypto.py b/tests/hazmat/backends/test_commoncrypto.py index 7ccc1aff..f7200016 100644 --- a/tests/hazmat/backends/test_commoncrypto.py +++ b/tests/hazmat/backends/test_commoncrypto.py @@ -9,15 +9,14 @@ import pytest from cryptography import utils from cryptography.exceptions import InternalError, _Reasons from cryptography.hazmat.backends import _available_backends -from cryptography.hazmat.primitives import interfaces +from cryptography.hazmat.primitives.ciphers import Cipher, CipherAlgorithm from cryptography.hazmat.primitives.ciphers.algorithms import AES -from cryptography.hazmat.primitives.ciphers.base import Cipher from cryptography.hazmat.primitives.ciphers.modes import CBC, GCM from ...utils import raises_unsupported_algorithm -@utils.register_interface(interfaces.CipherAlgorithm) +@utils.register_interface(CipherAlgorithm) class DummyCipher(object): name = "dummy-cipher" block_size = None |