From 15db87fa3e6ce736c0c3c0f8953e6f4367cc658a Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Fri, 22 May 2020 09:48:28 +0200 Subject: [PATCH] Possibile Fix Megaserver --- lib/megaserver/cursor.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/megaserver/cursor.py b/lib/megaserver/cursor.py index 3a3f2693..ec387b9c 100644 --- a/lib/megaserver/cursor.py +++ b/lib/megaserver/cursor.py @@ -66,15 +66,8 @@ class Cursor(object): def prepare_decoder(self,offset): initial_value = self.initial_value + int(offset/16) - try: - from Cryptodome.Cipher import AES - from Cryptodome.Util import Counter - self.decryptor = AES.new(self._file._client.a32_to_str(self.k), AES.MODE_CTR, counter = Counter.new(128, initial_value = initial_value)) - except: - from Crypto.Cipher import AES - from Crypto.Util import Counter - self.decryptor = AES.new(self._file._client.a32_to_str(self.k), AES.MODE_CTR, counter = Counter.new(128, initial_value = initial_value)) - + from lib import pyaes + self.decryptor = pyaes.AESModeOfOperationCTR(self._file._client.a32_to_str(self.k), counter=pyaes.Counter(initial_value=initial_value)) rest = offset - int(offset/16)*16 if rest: self.decode(str(0)*rest)