diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 16:55:40 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 16:55:40 -0700 |
| commit | e761f8b33519104605b14cf8a24e9f68bd23b624 (patch) | |
| tree | 672968fa7c23790bc9f5c9cd3c779adce09fae8c /tests/bindings/test_openssl.py | |
| parent | 62ebc7e212a92a13c3836de5d129cb93f40a128d (diff) | |
| parent | 169dee88faa7c46b5551b89cf97a1b30c0a1c6ea (diff) | |
| download | cryptography-e761f8b33519104605b14cf8a24e9f68bd23b624.tar.gz cryptography-e761f8b33519104605b14cf8a24e9f68bd23b624.tar.bz2 cryptography-e761f8b33519104605b14cf8a24e9f68bd23b624.zip | |
Merge branch 'master' into triple-des
Also moved most of the tests to the new format except for one which doesn't yet
have an obvious translation
Conflicts:
cryptography/primitives/block/ciphers.py
tests/primitives/test_nist.py
Diffstat (limited to 'tests/bindings/test_openssl.py')
| -rw-r--r-- | tests/bindings/test_openssl.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/bindings/test_openssl.py b/tests/bindings/test_openssl.py index 1579f002..e5b78d18 100644 --- a/tests/bindings/test_openssl.py +++ b/tests/bindings/test_openssl.py @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from cryptography.bindings.openssl import api +from cryptography.bindings.openssl.api import api class TestOpenSSL(object): @@ -28,3 +28,6 @@ class TestOpenSSL(object): for every OpenSSL. """ assert api.openssl_version_text().startswith("OpenSSL") + + def test_supports_cipher(self): + assert api.supports_cipher("not-a-real-cipher") is False |