[refactor] simplify _crypto

After adding the streaming decrypt, some classes were doing almost the
same thing. Unified them.
Also fixed some module level variables to upper case and some class name
to camel case.

1 files changed, 3 insertions, 2 deletions

diff --git a/testing/tests/client/test_crypto.py b/testing/tests/client/test_crypto.py
index 863873f7..7643f75d 100644
--- a/testing/tests/client/test_crypto.py
+++ b/testing/tests/client/test_crypto.py
@@ -52,7 +52,7 @@ class AESTest(unittest.TestCase):
         key = 'A' * 32
 
         fd = BytesIO()
-        aes = _crypto.AESEncryptor(key, fd)
+        aes = _crypto.AESConsumer(key, _buffer=fd)
         iv = aes.iv
 
         data = snowden1
@@ -78,7 +78,8 @@ class AESTest(unittest.TestCase):
         ciphertext = _aes_encrypt(key, iv, data)
 
         fd = BytesIO()
-        aes = _crypto.AESDecryptor(key, iv, fd)
+        operation = _crypto.AESConsumer.decrypt
+        aes = _crypto.AESConsumer(key, iv, fd, operation)
 
         for i in range(len(ciphertext) / block):
             chunk = ciphertext[i * block:(i + 1) * block]