diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-07 09:10:08 -0500 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-07 09:10:08 -0500 |
commit | 83c9cdaf1d8cb0d1a60f89935e237fa5fffcc571 (patch) | |
tree | 10df6ccc2fe0566630df5f8ca2d40031b20b72c3 /tests/hazmat/primitives/test_camellia.py | |
parent | de1bc1f5fd25cee71a25bf3e50c57137cb81c08d (diff) | |
parent | 4fc597d9990bdf17f714ae1a3a3f759e4039e4a9 (diff) | |
download | cryptography-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_camellia.py')
-rw-r--r-- | tests/hazmat/primitives/test_camellia.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py index 8bdcb309..87fcfe3d 100644 --- a/tests/hazmat/primitives/test_camellia.py +++ b/tests/hazmat/primitives/test_camellia.py @@ -20,7 +20,7 @@ from ...utils import ( @pytest.mark.supported( only_if=lambda backend: backend.cipher_supported( - algorithms.Camellia("\x00" * 16), modes.ECB() + algorithms.Camellia(b"\x00" * 16), modes.ECB() ), skip_message="Does not support Camellia ECB", ) @@ -41,7 +41,7 @@ class TestCamelliaModeECB(object): @pytest.mark.supported( only_if=lambda backend: backend.cipher_supported( - algorithms.Camellia("\x00" * 16), modes.CBC("\x00" * 16) + algorithms.Camellia(b"\x00" * 16), modes.CBC(b"\x00" * 16) ), skip_message="Does not support Camellia CBC", ) @@ -58,7 +58,7 @@ class TestCamelliaModeCBC(object): @pytest.mark.supported( only_if=lambda backend: backend.cipher_supported( - algorithms.Camellia("\x00" * 16), modes.OFB("\x00" * 16) + algorithms.Camellia(b"\x00" * 16), modes.OFB(b"\x00" * 16) ), skip_message="Does not support Camellia OFB", ) @@ -75,7 +75,7 @@ class TestCamelliaModeOFB(object): @pytest.mark.supported( only_if=lambda backend: backend.cipher_supported( - algorithms.Camellia("\x00" * 16), modes.CFB("\x00" * 16) + algorithms.Camellia(b"\x00" * 16), modes.CFB(b"\x00" * 16) ), skip_message="Does not support Camellia CFB", ) |