diff options
Diffstat (limited to 'module/plugins/container/RSDF.py')
| -rw-r--r-- | module/plugins/container/RSDF.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 2401a79ce..ec9e89171 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -5,22 +5,22 @@ from __future__ import with_statement import binascii import re -from Crypto.Cipher import AES +import Crypto.Cipher from module.plugins.internal.Container import Container -from module.plugins.internal.utils import encode +from module.plugins.internal.misc import encode class RSDF(Container): __name__ = "RSDF" __type__ = "container" - __version__ = "0.33" + __version__ = "0.34" __status__ = "testing" __pattern__ = r'.+\.rsdf$' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] + __config__ = [("activated" , "bool" , "Activated" , True ), + ("use_premium" , "bool" , "Use premium account if available", True ), + ("folder_per_package", "Default;Yes;No", "Create folder for each package" , "Default")] __description__ = """RSDF container decrypter plugin""" __license__ = "GPLv3" @@ -37,11 +37,11 @@ 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 = encode(pyfile.url.strip()) + fs_filename = encode(pyfile.url) with open(fs_filename, 'r') as rsdf: data = rsdf.read() |