diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-02-16 12:33:37 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-02-16 12:33:37 -0800 |
| commit | 426eee7e732f90f04740e055381f0b37dadc2df1 (patch) | |
| tree | 61540da76f61fa12fd15e2ba099a4d66f9391dfb /tests | |
| parent | 99c1b803aeb2260d8dbc131aca608276a714285c (diff) | |
| parent | a308f9f9fad845da1d1492ce8e4e37d68f3bfcfc (diff) | |
| download | cryptography-426eee7e732f90f04740e055381f0b37dadc2df1.tar.gz cryptography-426eee7e732f90f04740e055381f0b37dadc2df1.tar.bz2 cryptography-426eee7e732f90f04740e055381f0b37dadc2df1.zip | |
Merge pull request #1665 from reaperhulk/move-asym-padding-interface
move asymmetric padding interface to primitives.asymmetric.padding
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 4 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_rsa.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 6e3d80e9..21e902f1 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -19,7 +19,7 @@ from cryptography.hazmat.backends.openssl.backend import ( Backend, backend ) from cryptography.hazmat.backends.openssl.ec import _sn_to_elliptic_curve -from cryptography.hazmat.primitives import hashes, interfaces +from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.asymmetric import dsa, padding from cryptography.hazmat.primitives.ciphers import ( BlockCipherAlgorithm, Cipher, CipherAlgorithm @@ -45,7 +45,7 @@ class DummyCipher(object): key_size = None -@utils.register_interface(interfaces.AsymmetricPadding) +@utils.register_interface(padding.AsymmetricPadding) class DummyPadding(object): name = "dummy-cipher" diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py index 33e5373b..6d8e6874 100644 --- a/tests/hazmat/primitives/test_rsa.py +++ b/tests/hazmat/primitives/test_rsa.py @@ -37,7 +37,7 @@ from ...utils import ( ) -@utils.register_interface(interfaces.AsymmetricPadding) +@utils.register_interface(padding.AsymmetricPadding) class DummyPadding(object): name = "UNSUPPORTED-PADDING" |