From 250884489edc7e570c869f989c4ab6e3a3053503 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 19 Oct 2023 13:12:15 +0200 Subject: [PATCH] Revert "lnonion: fix decode_onion_error" This reverts commit 08132d6b7dd1409a283103c5e737977496c468d9. --- electrum/lnonion.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/electrum/lnonion.py b/electrum/lnonion.py index e66ce777b..d996ab521 100644 --- a/electrum/lnonion.py +++ b/electrum/lnonion.py @@ -429,11 +429,11 @@ def _decode_onion_error(error_packet: bytes, payment_path_pubkeys: Sequence[byte ammag_key = get_bolt04_onion_key(b'ammag', hop_shared_secrets[i]) um_key = get_bolt04_onion_key(b'um', hop_shared_secrets[i]) stream_bytes = generate_cipher_stream(ammag_key, len(error_packet)) - error_packet_decoded = xor_bytes(error_packet, stream_bytes) - hmac_computed = hmac_oneshot(um_key, msg=error_packet_decoded[32:], digest=hashlib.sha256) - hmac_found = error_packet_decoded[:32] + error_packet = xor_bytes(error_packet, stream_bytes) + hmac_computed = hmac_oneshot(um_key, msg=error_packet[32:], digest=hashlib.sha256) + hmac_found = error_packet[:32] if hmac_computed == hmac_found: - return error_packet_decoded, i + return error_packet, i raise FailedToDecodeOnionError()