Skip to content

Commit

Permalink
trim whitespace from end of onion before decoding
Browse files Browse the repository at this point in the history
  • Loading branch information
remyers authored and rustyrussell committed Nov 14, 2019
1 parent 1c6ac95 commit 2821187
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion devtools/onion.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,13 @@ static void do_decode(int argc, char **argv, const u8 assocdata[ASSOC_DATA_SIZE]
opt_usage_exit_fail("Expect an filename and privkey with 'decode' method");

char *hextemp = grab_file(ctx, argv[2]);
if (!hex_decode(hextemp, strlen(hextemp), serialized, sizeof(serialized))) {
size_t hexlen = strlen(hextemp);

// trim trailing whitespace
while (isspace(hextemp[hexlen-1]))
hexlen--;

if (!hex_decode(hextemp, hexlen, serialized, sizeof(serialized))) {
errx(1, "Invalid onion hex '%s'", hextemp);
}

Expand Down

0 comments on commit 2821187

Please sign in to comment.