From 7a9392f4868f596cc0293f14266daa9f3752432f Mon Sep 17 00:00:00 2001 From: souliane Date: Thu, 12 Jun 2014 15:57:22 +0200 Subject: [PATCH] test (memory): fixes crypto encryption/decryption test --- src/test/test_memory_crypto.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/test/test_memory_crypto.py b/src/test/test_memory_crypto.py index b52b4daa..853e3b2c 100644 --- a/src/test/test_memory_crypto.py +++ b/src/test/test_memory_crypto.py @@ -34,14 +34,18 @@ class CryptoTest(helpers.SatTestCase): def test_encrypt_decrypt(self): d_list = [] + + def test(key, message): + d = BlockCipher.encrypt(key, message) + d.addCallback(lambda ciphertext: BlockCipher.decrypt(key, ciphertext)) + d.addCallback(lambda decrypted: self.assertEqual(message, decrypted)) + d_list.append(d) + for key_len in (0, 2, 8, 10, 16, 24, 30, 32, 40): key = urandom(key_len) for message_len in (0, 2, 16, 24, 32, 100): message = urandom(message_len) - d = BlockCipher.encrypt(key, message) - d.addCallback(lambda ciphertext: lambda key, cipher: BlockCipher.decrypt(key, ciphertext)) - d.addCallback(lambda decrypted: lambda message, decrypted: self.assertEqual(message, decrypted)) - d_list.append(d) + test(key, message) return defer.DeferredList(d_list) def test_hash_verify(self):