mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-03 10:46:58 +01:00
Code Issues Projects Releases Wiki Activity

devtools/onion: allow setting the associated data.

Browse source 
This is required for actually creating usable onions.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-07-17 07:20:14 +09:30 • committed by neil saitug
parent 1b8adabd4f
commit b9ea1165c4
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
devtools/onion.c
View file

@ -9,7 +9,10 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
static void do_generate(int argc, char **argv) #define ASSOC_DATA_SIZE 32
static void do_generate(int argc, char **argv,
const u8 assocdata[ASSOC_DATA_SIZE])
{ {
const tal_t *ctx = talz(NULL, tal_t); const tal_t *ctx = talz(NULL, tal_t);
int num_hops = argc - 1; int num_hops = argc - 1;
@ -18,10 +21,8 @@ static void do_generate(int argc, char **argv)
u8 sessionkey[32]; u8 sessionkey[32];
struct hop_data hops_data[num_hops]; struct hop_data hops_data[num_hops];
struct secret *shared_secrets; struct secret *shared_secrets;
u8 assocdata[32];
memset(&sessionkey, 'A', sizeof(sessionkey)); memset(&sessionkey, 'A', sizeof(sessionkey));
memset(&assocdata, 'B', sizeof(assocdata));
for (int i = 0; i < num_hops; i++) { for (int i = 0; i < num_hops; i++) {
if (!hex_decode(argv[1 + i], 66, privkeys[i], 33)) { if (!hex_decode(argv[1 + i], 66, privkeys[i], 33)) {
@ -44,8 +45,8 @@ static void do_generate(int argc, char **argv)
} }
struct onionpacket *res = struct onionpacket *res =
create_onionpacket(ctx, path, hops_data, sessionkey, assocdata, create_onionpacket(ctx, path, hops_data, sessionkey,
sizeof(assocdata), &shared_secrets); assocdata, ASSOC_DATA_SIZE, &shared_secrets);
u8 *serialized = serialize_onionpacket(ctx, res); u8 *serialized = serialize_onionpacket(ctx, res);
if (!serialized) if (!serialized)
@ -55,7 +56,7 @@ static void do_generate(int argc, char **argv)
tal_free(ctx); tal_free(ctx);
} }
static void do_decode(int argc, char **argv) static void do_decode(int argc, char **argv, const u8 assocdata[ASSOC_DATA_SIZE])
{ {
struct route_step *step; struct route_step *step;
struct onionpacket *msg; struct onionpacket *msg;
@ -65,11 +66,8 @@ static void do_decode(int argc, char **argv)
char hextemp[2 * sizeof(serialized)]; char hextemp[2 * sizeof(serialized)];
memset(hextemp, 0, sizeof(hextemp)); memset(hextemp, 0, sizeof(hextemp));
u8 shared_secret[32]; u8 shared_secret[32];
u8 assocdata[32];
enum onion_type why_bad; enum onion_type why_bad;
memset(&assocdata, 'B', sizeof(assocdata));
if (argc != 2) if (argc != 2)
opt_usage_exit_fail("Expect a privkey with --decode"); opt_usage_exit_fail("Expect a privkey with --decode");
@ -91,8 +89,8 @@ static void do_decode(int argc, char **argv)
if (!onion_shared_secret(shared_secret, msg, &seckey)) if (!onion_shared_secret(shared_secret, msg, &seckey))
errx(1, "Error creating shared secret."); errx(1, "Error creating shared secret.");
step = process_onionpacket(ctx, msg, shared_secret, assocdata, step = process_onionpacket(ctx, msg, shared_secret,
sizeof(assocdata)); assocdata, ASSOC_DATA_SIZE);
if (!step || !step->next) if (!step || !step->next)
errx(1, "Error processing message."); errx(1, "Error processing message.");
@ -107,11 +105,27 @@ static void do_decode(int argc, char **argv)
tal_free(ctx); tal_free(ctx);
} }
static char *opt_set_ad(const char *arg, u8 *assocdata)
{
if (!hex_decode(arg, strlen(arg), assocdata, ASSOC_DATA_SIZE))
return "Bad hex string";
return NULL;
}
static void opt_show_ad(char buf[OPT_SHOW_LEN], const u8 *assocdata)
{
hex_encode(assocdata, ASSOC_DATA_SIZE, buf, OPT_SHOW_LEN);
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
setup_locale(); setup_locale();
bool generate = false, decode = false; bool generate = false, decode = false;
u8 assocdata[ASSOC_DATA_SIZE];
memset(&assocdata, 'B', sizeof(assocdata));
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY | secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY |
SECP256K1_CONTEXT_SIGN); SECP256K1_CONTEXT_SIGN);
@ -124,12 +138,15 @@ int main(int argc, char **argv)
"Generate onion through the given hex pubkeys"); "Generate onion through the given hex pubkeys");
opt_register_noarg("--decode", opt_set_bool, &decode, opt_register_noarg("--decode", opt_set_bool, &decode,
"Decode onion from stdin given the private key"); "Decode onion from stdin given the private key");
opt_register_arg("--assoc-data", opt_set_ad, opt_show_ad,
assocdata,
"Associated data (usu. payment_hash of payment)");
opt_parse(&argc, argv, opt_log_stderr_exit); opt_parse(&argc, argv, opt_log_stderr_exit);
if (generate) if (generate)
do_generate(argc, argv); do_generate(argc, argv, assocdata);
else if (decode) else if (decode)
do_decode(argc, argv); do_decode(argc, argv, assocdata);
return 0; return 0;
} }