aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

sphinx: Use fromwire_tal_arrn() to deserialize compressed onions

Browse Source 
Suggested-by: Rusty Russell <@rustyrussell>
Signed-off-by: Christian Decker <@cdecker>
This commit is contained in:
Christian Decker
2020-03-04 10:16:35 +01:00
committed by Rusty Russell
parent ef86ee0bae
commit 37105497f0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/sphinx.c
View File

@@ -824,12 +824,11 @@ sphinx_compressed_onion_deserialize(const tal_t *ctx, const u8 *src)
{ {
const u8 *cursor = src; const u8 *cursor = src;
size_t max = tal_bytelen(src); size_t max = tal_bytelen(src);
size_t routelen = max - VERSION_SIZE - PUBKEY_SIZE - HMAC_SIZE;
struct sphinx_compressed_onion *dst = struct sphinx_compressed_onion *dst =
tal(ctx, struct sphinx_compressed_onion); tal(ctx, struct sphinx_compressed_onion);
/* This is not a compressed onion, so let's not parse it. */ /* This is not a compressed onion, so let's not parse it. */
if (routelen > ROUTING_INFO_SIZE) if (max > TOTAL_PACKET_SIZE)
return tal_free(dst); return tal_free(dst);
dst->version = fromwire_u8(&cursor, &max); dst->version = fromwire_u8(&cursor, &max);
@@ -837,11 +836,12 @@ sphinx_compressed_onion_deserialize(const tal_t *ctx, const u8 *src)
return tal_free(dst); return tal_free(dst);
fromwire_pubkey(&cursor, &max, &dst->ephemeralkey); fromwire_pubkey(&cursor, &max, &dst->ephemeralkey);
dst->routinginfo = fromwire_tal_arrn(dst, &cursor, &max, max - HMAC_SIZE);
dst->routinginfo = tal_arr(dst, u8, routelen);
fromwire_u8_array(&cursor, &max, dst->routinginfo, routelen);
fromwire_u8_array(&cursor, &max, dst->mac, HMAC_SIZE); fromwire_u8_array(&cursor, &max, dst->mac, HMAC_SIZE);
assert(max == 0); /* If at any point we failed to pull from the serialized compressed
* onion the entire deserialization is considered to have failed. */
if (cursor == NULL)
return tal_free(dst);
return dst; return dst;
} }