Accept tuple in param

pull/79/head
tuxxy 2017-10-16 13:12:22 -06:00
parent f83486636b
commit 299e89105e
No known key found for this signature in database
GPG Key ID: 7BB971A0E89144D9
1 changed files with 4 additions and 5 deletions

View File

@ -247,22 +247,21 @@ class EncryptingPower(CryptoPowerUp):
def decrypt(
self,
enc_data: bytes,
enc_key: bytes,
enc_data: Tuple[bytes, bytes],
privkey: bytes = None
) -> bytes:
"""
Decrypts data using ECIES PKE. If no `privkey` is provided, it uses
`self.priv_key`.
:param enc_data: Data to decrypt
:param enc_key: (Serialized) Encapsulated ECIES key
:param enc_data: Tuple: (encrypted data, ECIES encapsulated key)
:param privkey: Private key to decapsulate with
:return: Decrypted data
"""
privkey = privkey or self.priv_key
ciphertext, enc_key = enc_data
enc_key = API.elliptic_curve.deserialize(enc_key)
dec_key = API.ecies_decapsulate(privkey, enc_key)
return API.symm_decrypt(dec_key, enc_data)
return API.symm_decrypt(dec_key, ciphertext)