oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev445, Fix and test random fail in CryptMessage decrypt

Browse source
This commit is contained in:
shortcutme 2020-02-18 15:28:14 +01:00
parent 8aa4e27938
commit 64e5e0c80e
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
plugins/CryptMessage/CryptMessage.py
View file

@ -1,13 +1,13 @@
import hashlib
import base64
import binascii
import struct
import lib.pybitcointools as btctools
from util import ThreadPool
from Crypt import Crypt
ecc_cache = {}
def eciesEncrypt(data, pubkey, ephemcurve=None, ciphername='aes-256-cbc'):
from lib import pyelliptic
pubkey_openssl = toOpensslPublickey(base64.b64decode(pubkey))
@ -32,7 +32,7 @@ def eciesDecryptMulti(encrypted_datas, privatekey):
try:
text = eciesDecrypt(encrypted_data, privatekey).decode("utf8")
texts.append(text)
except:
except Exception:
texts.append(None)
return texts
@ -41,9 +41,26 @@ def eciesDecrypt(encrypted_data, privatekey):
ecc_key = getEcc(privatekey)
return ecc_key.decrypt(base64.b64decode(encrypted_data))
def decodePubkey(pubkey):
i = 0
curve = struct.unpack('!H', pubkey[i:i + 2])[0]
i += 2
tmplen = struct.unpack('!H', pubkey[i:i + 2])[0]
i += 2
pubkey_x = pubkey[i:i + tmplen]
i += tmplen
tmplen = struct.unpack('!H', pubkey[i:i + 2])[0]
i += 2
pubkey_y = pubkey[i:i + tmplen]
i += tmplen
return curve, pubkey_x, pubkey_y, i
def split(encrypted):
iv = encrypted[0:16]
ciphertext = encrypted[16 + 70:-32]
curve, pubkey_x, pubkey_y, i = decodePubkey(encrypted[16:])
ciphertext = encrypted[16 + i:-32]
return iv, ciphertext