[RSDF] Fix https://github.com/pyload/pyload/issues/1204

2 files changed, 6 insertions, 5 deletions

diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py
index b01e3098c..d1c34ef50 100644
--- a/module/plugins/container/DLC.py
+++ b/module/plugins/container/DLC.py
@@ -49,9 +49,9 @@ class DLC(Container):
         except AttributeError:
             self.fail(_("Container is corrupted"))
 
-        cipher = AES.new(self.KEY, AES.MODE_CBC, self.IV).decrypt(rc)
+        key = iv = AES.new(self.KEY, AES.MODE_CBC, self.IV).decrypt(rc)
 
-        self.data     = AES.new(cipher, AES.MODE_CBC, cipher).decrypt(dlc_data).decode('base64')
+        self.data     = AES.new(key, AES.MODE_CBC, iv).decrypt(dlc_data).decode('base64')
         self.packages = [(entry[0] if entry[0] else pyfile.name, entry[1], entry[0] if entry[0] else pyfile.name) \
                          for entry in self.getPackages()]
 
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
index 8f9bfc0d5..222c8d6ae 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/container/RSDF.py
@@ -14,7 +14,7 @@ from module.utils import fs_encode
 class RSDF(Container):
     __name__    = "RSDF"
     __type__    = "container"
-    __version__ = "0.27"
+    __version__ = "0.28"
 
     __pattern__ = r'.+\.rsdf$'
 
@@ -31,9 +31,10 @@ class RSDF(Container):
 
     def decrypt(self, pyfile):
         KEY = binascii.unhexlify(self.KEY)
-        IV  = AES.new(Key, AES.MODE_ECB).encrypt(binascii.unhexlify(self.IV))
+        IV  = binascii.unhexlify(self.IV)
 
-        cipher = AES.new(KEY, AES.MODE_CFB, IV)
+        iv     = AES.new(KEY, AES.MODE_ECB).encrypt(IV)
+        cipher = AES.new(KEY, AES.MODE_CFB, iv)
 
         try:
             file = fs_encode(pyfile.url.strip())