AaronFiore/electrum
1
0
Fork 0
Code Activity

channel backup versions: trivial clean-up

Browse Source
This commit is contained in:
SomberNight
2020-06-17 17:17:05 +02:00
committed by ThomasV
parent f9788a5d90
commit e1a2299f0c
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/crypto.py
View File

@@ -189,8 +189,7 @@ def _hash_password(password: Union[bytes, str], *, version: int) -> bytes:
raise UnexpectedPasswordHashVersion(version) raise UnexpectedPasswordHashVersion(version)
def pw_encode_raw(data: bytes, password: Union[bytes, str], *, version: int) -> str: def _pw_encode_raw(data: bytes, password: Union[bytes, str], *, version: int) -> bytes:
"""bytes -> bytes"""
if version not in KNOWN_PW_HASH_VERSIONS: if version not in KNOWN_PW_HASH_VERSIONS:
raise UnexpectedPasswordHashVersion(version) raise UnexpectedPasswordHashVersion(version)
# derive key from password # derive key from password
@@ -200,8 +199,7 @@ def pw_encode_raw(data: bytes, password: Union[bytes, str], *, version: int) ->
return ciphertext return ciphertext
def pw_decode_raw(data_bytes: bytes, password: Union[bytes, str], *, version: int) -> bytes: def _pw_decode_raw(data_bytes: bytes, password: Union[bytes, str], *, version: int) -> bytes:
"""bytes -> bytes"""
if version not in KNOWN_PW_HASH_VERSIONS: if version not in KNOWN_PW_HASH_VERSIONS:
raise UnexpectedPasswordHashVersion(version) raise UnexpectedPasswordHashVersion(version)
# derive key from password # derive key from password
@@ -216,7 +214,7 @@ def pw_decode_raw(data_bytes: bytes, password: Union[bytes, str], *, version: in
def pw_encode_bytes(data: bytes, password: Union[bytes, str], *, version: int) -> str: def pw_encode_bytes(data: bytes, password: Union[bytes, str], *, version: int) -> str:
"""plaintext bytes -> base64 ciphertext""" """plaintext bytes -> base64 ciphertext"""
ciphertext = pw_encode_raw(data, password, version=version) ciphertext = _pw_encode_raw(data, password, version=version)
ciphertext_b64 = base64.b64encode(ciphertext) ciphertext_b64 = base64.b64encode(ciphertext)
return ciphertext_b64.decode('utf8') return ciphertext_b64.decode('utf8')
@@ -226,7 +224,7 @@ def pw_decode_bytes(data: str, password: Union[bytes, str], *, version:int) -> b
if version not in KNOWN_PW_HASH_VERSIONS: if version not in KNOWN_PW_HASH_VERSIONS:
raise UnexpectedPasswordHashVersion(version) raise UnexpectedPasswordHashVersion(version)
data_bytes = bytes(base64.b64decode(data)) data_bytes = bytes(base64.b64decode(data))
return pw_decode_raw(data_bytes, password, version=version) return _pw_decode_raw(data_bytes, password, version=version)
def pw_encode_with_version_and_mac(data: bytes, password: Union[bytes, str]) -> str: def pw_encode_with_version_and_mac(data: bytes, password: Union[bytes, str]) -> str:
@@ -235,7 +233,7 @@ def pw_encode_with_version_and_mac(data: bytes, password: Union[bytes, str]) ->
# Encrypt-and-MAC. The MAC will be used to detect invalid passwords # Encrypt-and-MAC. The MAC will be used to detect invalid passwords
version = PW_HASH_VERSION_LATEST version = PW_HASH_VERSION_LATEST
mac = sha256(data)[0:4] mac = sha256(data)[0:4]
ciphertext = pw_encode_raw(data, password, version=version) ciphertext = _pw_encode_raw(data, password, version=version)
ciphertext_b64 = base64.b64encode(bytes([version]) + ciphertext + mac) ciphertext_b64 = base64.b64encode(bytes([version]) + ciphertext + mac)
return ciphertext_b64.decode('utf8') return ciphertext_b64.decode('utf8')
@@ -248,7 +246,7 @@ def pw_decode_with_version_and_mac(data: str, password: Union[bytes, str]) -> by
mac = data_bytes[-4:] mac = data_bytes[-4:]
if version not in KNOWN_PW_HASH_VERSIONS: if version not in KNOWN_PW_HASH_VERSIONS:
raise UnexpectedPasswordHashVersion(version) raise UnexpectedPasswordHashVersion(version)
decrypted = pw_decode_raw(encrypted, password, version=version) decrypted = _pw_decode_raw(encrypted, password, version=version)
if sha256(decrypted)[0:4] != mac: if sha256(decrypted)[0:4] != mac:
raise InvalidPassword() raise InvalidPassword()
return decrypted return decrypted

3
electrum/lnutil.py
View File

@@ -202,7 +202,8 @@ class ChannelBackupStorage(StoredObject):
vds = BCDataStream() vds = BCDataStream()
vds.write(s) vds.write(s)
version = vds.read_int16() version = vds.read_int16()
assert version == CHANNEL_BACKUP_VERSION if version != CHANNEL_BACKUP_VERSION:
raise Exception(f"unknown version for channel backup: {version}")
return ChannelBackupStorage( return ChannelBackupStorage(
is_initiator = bool(vds.read_bytes(1)), is_initiator = bool(vds.read_bytes(1)),
privkey = vds.read_bytes(32).hex(), privkey = vds.read_bytes(32).hex(),