From 9c3088fe12d844a2007e0eff0eb947af53de7f60 Mon Sep 17 00:00:00 2001
From: Julian Krause <julian.krause@gmail.com>
Date: Wed, 4 Dec 2013 14:49:50 -0800
Subject: Beginnings of a constant_time module.
---
tests/hazmat/primitives/test_constant_time.py | 41 +++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 tests/hazmat/primitives/test_constant_time.py
(limited to 'tests')
diff --git a/tests/hazmat/primitives/test_constant_time.py b/tests/hazmat/primitives/test_constant_time.py
new file mode 100644
index 00000000..dd910dee
--- /dev/null
+++ b/tests/hazmat/primitives/test_constant_time.py
@@ -0,0 +1,41 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import, division, print_function
+
+import pytest
+
+import six
+
+from cryptography.hazmat.primitives import constant_time
+
+
+class TestConstantTimeBytesEq(object):
+ def test_reject_unicode(self):
+ with pytest.raises(TypeError):
+ constant_time.bytes_eq(b"foo", six.u("foo"))
+
+ with pytest.raises(TypeError):
+ constant_time.bytes_eq(six.u("foo"), b"foo")
+
+ with pytest.raises(TypeError):
+ constant_time.bytes_eq(six.u("foo"), six.u("foo"))
+
+ def test_compares(self):
+ assert constant_time.bytes_eq(b"foo", b"foo") is True
+
+ assert constant_time.bytes_eq(b"foo", b"bar") is False
+
+ assert constant_time.bytes_eq(b"foobar", b"foo") is False
+
+ assert constant_time.bytes_eq(b"foo", b"foobar") is False
--
cgit v1.2.3
From f8796b15a279db82cdefcd00bebfef4cdef8fee8 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 13 Dec 2013 20:28:55 -0800
Subject: Renamed bindings to backends
---
tests/conftest.py | 2 +-
tests/hazmat/bindings/test_openssl.py | 4 ++--
tests/hazmat/primitives/utils.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'tests')
diff --git a/tests/conftest.py b/tests/conftest.py
index fab40b14..71662802 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,5 @@
def pytest_generate_tests(metafunc):
- from cryptography.hazmat.bindings import _ALL_BACKENDS
+ from cryptography.hazmat.backends import _ALL_BACKENDS
if "backend" in metafunc.fixturenames:
metafunc.parametrize("backend", _ALL_BACKENDS)
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py
index 1eb6f200..962959b9 100644
--- a/tests/hazmat/bindings/test_openssl.py
+++ b/tests/hazmat/bindings/test_openssl.py
@@ -15,8 +15,8 @@ import pytest
from cryptography import utils
from cryptography.exceptions import UnsupportedAlgorithm
-from cryptography.hazmat.bindings import default_backend
-from cryptography.hazmat.bindings.openssl.backend import backend, Backend
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.backends.openssl.backend import backend, Backend
from cryptography.hazmat.primitives import interfaces
from cryptography.hazmat.primitives.ciphers import Cipher
from cryptography.hazmat.primitives.ciphers.algorithms import AES
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py
index 705983a0..b06f9b29 100644
--- a/tests/hazmat/primitives/utils.py
+++ b/tests/hazmat/primitives/utils.py
@@ -3,7 +3,7 @@ import os
import pytest
-from cryptography.hazmat.bindings import _ALL_BACKENDS
+from cryptography.hazmat.backends import _ALL_BACKENDS
from cryptography.hazmat.primitives import hashes, hmac
from cryptography.hazmat.primitives.ciphers import Cipher
from cryptography.exceptions import (
--
cgit v1.2.3
From 41e5ab64e9526c1e759034bafb3d75c1492ff54d Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 13 Dec 2013 20:41:49 -0800
Subject: Also rename teh tests
---
tests/hazmat/backends/__init__.py | 0
tests/hazmat/backends/test_openssl.py | 97 +++++++++++++++++++++++++++++++++++
tests/hazmat/bindings/__init__.py | 0
tests/hazmat/bindings/test_openssl.py | 97 -----------------------------------
4 files changed, 97 insertions(+), 97 deletions(-)
create mode 100644 tests/hazmat/backends/__init__.py
create mode 100644 tests/hazmat/backends/test_openssl.py
delete mode 100644 tests/hazmat/bindings/__init__.py
delete mode 100644 tests/hazmat/bindings/test_openssl.py
(limited to 'tests')
diff --git a/tests/hazmat/backends/__init__.py b/tests/hazmat/backends/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
new file mode 100644
index 00000000..962959b9
--- /dev/null
+++ b/tests/hazmat/backends/test_openssl.py
@@ -0,0 +1,97 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+
+from cryptography import utils
+from cryptography.exceptions import UnsupportedAlgorithm
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.backends.openssl.backend import backend, Backend
+from cryptography.hazmat.primitives import interfaces
+from cryptography.hazmat.primitives.ciphers import Cipher
+from cryptography.hazmat.primitives.ciphers.algorithms import AES
+from cryptography.hazmat.primitives.ciphers.modes import CBC
+
+
+class DummyMode(object):
+ pass
+
+
+@utils.register_interface(interfaces.CipherAlgorithm)
+class DummyCipher(object):
+ pass
+
+
+class TestOpenSSL(object):
+ def test_backend_exists(self):
+ assert backend
+
+ def test_is_default(self):
+ assert backend == default_backend()
+
+ def test_openssl_version_text(self):
+ """
+ This test checks the value of OPENSSL_VERSION_TEXT.
+
+ Unfortunately, this define does not appear to have a
+ formal content definition, so for now we'll test to see
+ if it starts with OpenSSL as that appears to be true
+ for every OpenSSL.
+ """
+ assert backend.openssl_version_text().startswith("OpenSSL")
+
+ def test_supports_cipher(self):
+ assert backend.cipher_supported(None, None) is False
+
+ def test_register_duplicate_cipher_adapter(self):
+ with pytest.raises(ValueError):
+ backend.register_cipher_adapter(AES, CBC, None)
+
+ def test_instances_share_ffi(self):
+ b = Backend()
+ assert b.ffi is backend.ffi
+ assert b.lib is backend.lib
+
+ def test_nonexistent_cipher(self):
+ b = Backend()
+ b.register_cipher_adapter(
+ DummyCipher,
+ DummyMode,
+ lambda backend, cipher, mode: backend.ffi.NULL
+ )
+ cipher = Cipher(
+ DummyCipher(), DummyMode(), backend=b,
+ )
+ with pytest.raises(UnsupportedAlgorithm):
+ cipher.encryptor()
+
+ def test_handle_unknown_error(self):
+ with pytest.raises(SystemError):
+ backend._handle_error_code(0, 0, 0)
+
+ with pytest.raises(SystemError):
+ backend._handle_error_code(backend.lib.ERR_LIB_EVP, 0, 0)
+
+ with pytest.raises(SystemError):
+ backend._handle_error_code(
+ backend.lib.ERR_LIB_EVP,
+ backend.lib.EVP_F_EVP_ENCRYPTFINAL_EX,
+ 0
+ )
+
+ with pytest.raises(SystemError):
+ backend._handle_error_code(
+ backend.lib.ERR_LIB_EVP,
+ backend.lib.EVP_F_EVP_DECRYPTFINAL_EX,
+ 0
+ )
diff --git a/tests/hazmat/bindings/__init__.py b/tests/hazmat/bindings/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py
deleted file mode 100644
index 962959b9..00000000
--- a/tests/hazmat/bindings/test_openssl.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import pytest
-
-from cryptography import utils
-from cryptography.exceptions import UnsupportedAlgorithm
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.backends.openssl.backend import backend, Backend
-from cryptography.hazmat.primitives import interfaces
-from cryptography.hazmat.primitives.ciphers import Cipher
-from cryptography.hazmat.primitives.ciphers.algorithms import AES
-from cryptography.hazmat.primitives.ciphers.modes import CBC
-
-
-class DummyMode(object):
- pass
-
-
-@utils.register_interface(interfaces.CipherAlgorithm)
-class DummyCipher(object):
- pass
-
-
-class TestOpenSSL(object):
- def test_backend_exists(self):
- assert backend
-
- def test_is_default(self):
- assert backend == default_backend()
-
- def test_openssl_version_text(self):
- """
- This test checks the value of OPENSSL_VERSION_TEXT.
-
- Unfortunately, this define does not appear to have a
- formal content definition, so for now we'll test to see
- if it starts with OpenSSL as that appears to be true
- for every OpenSSL.
- """
- assert backend.openssl_version_text().startswith("OpenSSL")
-
- def test_supports_cipher(self):
- assert backend.cipher_supported(None, None) is False
-
- def test_register_duplicate_cipher_adapter(self):
- with pytest.raises(ValueError):
- backend.register_cipher_adapter(AES, CBC, None)
-
- def test_instances_share_ffi(self):
- b = Backend()
- assert b.ffi is backend.ffi
- assert b.lib is backend.lib
-
- def test_nonexistent_cipher(self):
- b = Backend()
- b.register_cipher_adapter(
- DummyCipher,
- DummyMode,
- lambda backend, cipher, mode: backend.ffi.NULL
- )
- cipher = Cipher(
- DummyCipher(), DummyMode(), backend=b,
- )
- with pytest.raises(UnsupportedAlgorithm):
- cipher.encryptor()
-
- def test_handle_unknown_error(self):
- with pytest.raises(SystemError):
- backend._handle_error_code(0, 0, 0)
-
- with pytest.raises(SystemError):
- backend._handle_error_code(backend.lib.ERR_LIB_EVP, 0, 0)
-
- with pytest.raises(SystemError):
- backend._handle_error_code(
- backend.lib.ERR_LIB_EVP,
- backend.lib.EVP_F_EVP_ENCRYPTFINAL_EX,
- 0
- )
-
- with pytest.raises(SystemError):
- backend._handle_error_code(
- backend.lib.ERR_LIB_EVP,
- backend.lib.EVP_F_EVP_DECRYPTFINAL_EX,
- 0
- )
--
cgit v1.2.3