| OLD | NEW |
| 1 """PyCrypto AES implementation.""" | 1 """PyCrypto AES implementation.""" |
| 2 | 2 |
| 3 from cryptomath import * | 3 from cryptomath import * |
| 4 from AES import * | 4 from aes import * |
| 5 | 5 |
| 6 if pycryptoLoaded: | 6 if pycryptoLoaded: |
| 7 import Crypto.Cipher.AES | 7 import Crypto.Cipher.AES |
| 8 | 8 |
| 9 def new(key, mode, IV): | 9 def new(key, mode, IV): |
| 10 return PyCrypto_AES(key, mode, IV) | 10 return PyCrypto_AES(key, mode, IV) |
| 11 | 11 |
| 12 class PyCrypto_AES(AES): | 12 class PyCrypto_AES(AES): |
| 13 | 13 |
| 14 def __init__(self, key, mode, IV): | 14 def __init__(self, key, mode, IV): |
| 15 AES.__init__(self, key, mode, IV, "pycrypto") | 15 AES.__init__(self, key, mode, IV, "pycrypto") |
| 16 self.context = Crypto.Cipher.AES.new(key, mode, IV) | 16 self.context = Crypto.Cipher.AES.new(key, mode, IV) |
| 17 | 17 |
| 18 def encrypt(self, plaintext): | 18 def encrypt(self, plaintext): |
| 19 return self.context.encrypt(plaintext) | 19 return self.context.encrypt(plaintext) |
| 20 | 20 |
| 21 def decrypt(self, ciphertext): | 21 def decrypt(self, ciphertext): |
| 22 return self.context.decrypt(ciphertext) | 22 return self.context.decrypt(ciphertext) |
| OLD | NEW |