aboutsummaryrefslogtreecommitdiffstats
path: root/tests/primitives/test_block.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-08-09 10:26:18 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2013-08-09 10:26:18 -0700
commitb1895f6f786b8be3bbaedf0b17ef1337b71bcfa1 (patch)
treec9f546932328394772ea348b70c6415b6cbdefa0 /tests/primitives/test_block.py
parent92c1f35054c79f3aef26712ac7ca16480f1847a0 (diff)
downloadcryptography-b1895f6f786b8be3bbaedf0b17ef1337b71bcfa1.tar.gz
cryptography-b1895f6f786b8be3bbaedf0b17ef1337b71bcfa1.tar.bz2
cryptography-b1895f6f786b8be3bbaedf0b17ef1337b71bcfa1.zip
Steps to get this running on py32 and py33 again
Diffstat (limited to 'tests/primitives/test_block.py')
-rw-r--r--tests/primitives/test_block.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/primitives/test_block.py b/tests/primitives/test_block.py
index f2da5830..8c311d5c 100644
--- a/tests/primitives/test_block.py
+++ b/tests/primitives/test_block.py
@@ -13,8 +13,8 @@ class TestBlockCipher(object):
)
def test_aes_cbc_nopadding(self, key, iv, plaintext, ciphertext):
cipher = BlockCipher(
- ciphers.AES(binascii.unhexlify(key)),
- modes.CBC(binascii.unhexlify(iv), padding.NoPadding())
+ ciphers.AES(binascii.unhexlify(key.encode("ascii"))),
+ modes.CBC(binascii.unhexlify(iv.encode("ascii")), padding.NoPadding())
)
actual_ciphertext = cipher.encrypt(binascii.unhexlify(plaintext))
actual_ciphertext += cipher.finalize()