aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_aes.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-03-07 09:10:08 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2016-03-07 09:10:08 -0500
commit83c9cdaf1d8cb0d1a60f89935e237fa5fffcc571 (patch)
tree10df6ccc2fe0566630df5f8ca2d40031b20b72c3 /tests/hazmat/primitives/test_aes.py
parentde1bc1f5fd25cee71a25bf3e50c57137cb81c08d (diff)
parent4fc597d9990bdf17f714ae1a3a3f759e4039e4a9 (diff)
downloadcryptography-83c9cdaf1d8cb0d1a60f89935e237fa5fffcc571.tar.gz
cryptography-83c9cdaf1d8cb0d1a60f89935e237fa5fffcc571.tar.bz2
cryptography-83c9cdaf1d8cb0d1a60f89935e237fa5fffcc571.zip
Merge pull request #2771 from reaperhulk/use-bytes
pass bytes to modes/algorithms like we should
Diffstat (limited to 'tests/hazmat/primitives/test_aes.py')
-rw-r--r--tests/hazmat/primitives/test_aes.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
index 2c3e5f90..8826aae8 100644
--- a/tests/hazmat/primitives/test_aes.py
+++ b/tests/hazmat/primitives/test_aes.py
@@ -18,7 +18,7 @@ from ...utils import load_nist_vectors
@pytest.mark.supported(
only_if=lambda backend: backend.cipher_supported(
- algorithms.AES("\x00" * 16), modes.CBC("\x00" * 16)
+ algorithms.AES(b"\x00" * 16), modes.CBC(b"\x00" * 16)
),
skip_message="Does not support AES CBC",
)
@@ -84,7 +84,7 @@ class TestAESModeECB(object):
@pytest.mark.supported(
only_if=lambda backend: backend.cipher_supported(
- algorithms.AES("\x00" * 16), modes.OFB("\x00" * 16)
+ algorithms.AES(b"\x00" * 16), modes.OFB(b"\x00" * 16)
),
skip_message="Does not support AES OFB",
)
@@ -117,7 +117,7 @@ class TestAESModeOFB(object):
@pytest.mark.supported(
only_if=lambda backend: backend.cipher_supported(
- algorithms.AES("\x00" * 16), modes.CFB("\x00" * 16)
+ algorithms.AES(b"\x00" * 16), modes.CFB(b"\x00" * 16)
),
skip_message="Does not support AES CFB",
)
@@ -150,7 +150,7 @@ class TestAESModeCFB(object):
@pytest.mark.supported(
only_if=lambda backend: backend.cipher_supported(
- algorithms.AES("\x00" * 16), modes.CFB8("\x00" * 16)
+ algorithms.AES(b"\x00" * 16), modes.CFB8(b"\x00" * 16)
),
skip_message="Does not support AES CFB8",
)
@@ -183,7 +183,7 @@ class TestAESModeCFB8(object):
@pytest.mark.supported(
only_if=lambda backend: backend.cipher_supported(
- algorithms.AES("\x00" * 16), modes.CTR("\x00" * 16)
+ algorithms.AES(b"\x00" * 16), modes.CTR(b"\x00" * 16)
),
skip_message="Does not support AES CTR",
)
@@ -200,7 +200,7 @@ class TestAESModeCTR(object):
@pytest.mark.supported(
only_if=lambda backend: backend.cipher_supported(
- algorithms.AES("\x00" * 16), modes.GCM("\x00" * 12)
+ algorithms.AES(b"\x00" * 16), modes.GCM(b"\x00" * 12)
),
skip_message="Does not support AES GCM",
)