stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

corrección librería crypto

Browse Source
This commit is contained in:
pipcat
2018-05-20 19:30:34 +02:00
parent f726e0c7a1
commit feb28acf65
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin.video.alfa/channels/pelispedia.py
+10 -4
View File
@@ -698,8 +698,7 @@ def evpKDF(passwd, salt, key_size=8, iv_size=4, iterations=1, hash_algorithm="md
} }
def obtener_cripto(password, plaintext): def obtener_cripto(password, plaintext):
import hashlib, os, base64, json import os, base64, json
from Crypto.Cipher import AES
SALT_LENGTH = 8 SALT_LENGTH = 8
BLOCK_SIZE = 16 BLOCK_SIZE = 16
KEY_SIZE = 32 KEY_SIZE = 32
@@ -712,8 +711,15 @@ def obtener_cripto(password, plaintext):
kdf = evpKDF(password, salt) kdf = evpKDF(password, salt)
cipherSpec = AES.new(kdf['key'], AES.MODE_CBC, iv) try: # Intentar con librería AES del sistema
ciphertext = cipherSpec.encrypt(paddedPlaintext) from Crypto.Cipher import AES
cipherSpec = AES.new(kdf['key'], AES.MODE_CBC, iv)
ciphertext = cipherSpec.encrypt(paddedPlaintext)
except: # Si falla intentar con librería del addon
import jscrypto
cipherSpec = jscrypto.new(kdf['key'], jscrypto.MODE_CBC, iv)
ciphertext = cipherSpec.encrypt(paddedPlaintext)
return json.dumps({'ct': base64.b64encode(ciphertext), 'iv': iv.encode("hex"), 's': salt.encode("hex")}, sort_keys=True, separators=(',', ':')) return json.dumps({'ct': base64.b64encode(ciphertext), 'iv': iv.encode("hex"), 's': salt.encode("hex")}, sort_keys=True, separators=(',', ':'))