diff options
Diffstat (limited to 'pyload/plugin/container')
| -rw-r--r-- | pyload/plugin/container/DLC.py | 6 | ||||
| -rw-r--r-- | pyload/plugin/container/RSDF.py | 6 | 
2 files changed, 6 insertions, 6 deletions
| diff --git a/pyload/plugin/container/DLC.py b/pyload/plugin/container/DLC.py index b2bfea30e..39b1597b0 100644 --- a/pyload/plugin/container/DLC.py +++ b/pyload/plugin/container/DLC.py @@ -5,7 +5,7 @@ from __future__ import with_statement  import re  import xml.dom.minidom -from Crypto.Cipher import AES +import Crypto  from pyload.plugin.Container import Container  from pyload.utils import decode, fs_encode @@ -49,9 +49,9 @@ class DLC(Container):          except AttributeError:              self.fail(_("Container is corrupted")) -        key = iv = AES.new(self.KEY, AES.MODE_CBC, self.IV).decrypt(rc) +        key = iv = Crypto.Cipher.AES.new(self.KEY, Crypto.Cipher.AES.MODE_CBC, self.IV).decrypt(rc) -        self.data     = AES.new(key, AES.MODE_CBC, iv).decrypt(dlc_data).decode('base64') +        self.data     = Crypto.Cipher.AES.new(key, Crypto.Cipher.AES.MODE_CBC, iv).decrypt(dlc_data).decode('base64')          self.packages = [(name or pyfile.name, links, name or pyfile.name) \                           for name, links in self.getPackages()] diff --git a/pyload/plugin/container/RSDF.py b/pyload/plugin/container/RSDF.py index 6f56ec06a..1de8ad8d4 100644 --- a/pyload/plugin/container/RSDF.py +++ b/pyload/plugin/container/RSDF.py @@ -5,7 +5,7 @@ from __future__ import with_statement  import binascii  import re -from Crypto.Cipher import AES +import Crypto  from pyload.plugin.Container import Container  from pyload.utils import fs_encode @@ -33,8 +33,8 @@ class RSDF(Container):          KEY = binascii.unhexlify(self.KEY)          IV  = binascii.unhexlify(self.IV) -        iv     = AES.new(KEY, AES.MODE_ECB).encrypt(IV) -        cipher = AES.new(KEY, AES.MODE_CFB, iv) +        iv     = Crypto.Cipher.AES.new(KEY, Crypto.Cipher.AES.MODE_ECB).encrypt(IV) +        cipher = Crypto.Cipher.AES.new(KEY, Crypto.Cipher.AES.MODE_CFB, iv)          try:              fs_filename = fs_encode(pyfile.url.strip()) | 
