mirror of
https://github.com/ElementsProject/lightning.git
synced 2024-11-19 01:43:36 +01:00
onion: Move cli onion tool to devtools/onion
Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker
parent
161ed320f8
commit
08bfb740f5
@ -4,7 +4,6 @@
|
||||
#include <ccan/short_types/short_types.h>
|
||||
#include <string.h>
|
||||
#include <ccan/str/hex/hex.h>
|
||||
#include <ccan/read_write_all/read_write_all.h>
|
||||
#include <common/sphinx.h>
|
||||
#include <common/utils.h>
|
||||
#include <err.h>
|
||||
@ -190,83 +189,8 @@ int main(int argc, char **argv)
|
||||
if (unit) {
|
||||
run_unit_tests();
|
||||
} else if (generate) {
|
||||
int num_hops = argc - 1;
|
||||
struct pubkey *path = tal_arr(ctx, struct pubkey, num_hops);
|
||||
u8 privkeys[argc - 1][32];
|
||||
u8 sessionkey[32];
|
||||
struct hop_data hops_data[num_hops];
|
||||
struct secret *shared_secrets;
|
||||
|
||||
memset(&sessionkey, 'A', sizeof(sessionkey));
|
||||
|
||||
int i;
|
||||
for (i = 0; i < num_hops; i++) {
|
||||
hex_decode(argv[1 + i], 66, privkeys[i], 33);
|
||||
if (secp256k1_ec_pubkey_create(secp256k1_ctx, &path[i].pubkey, privkeys[i]) != 1)
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (i = 0; i < num_hops; i++) {
|
||||
hops_data[i].realm = 0x00;
|
||||
memset(&hops_data[i].channel_id, i,
|
||||
sizeof(hops_data[i].channel_id));
|
||||
hops_data[i].amt_forward = i;
|
||||
hops_data[i].outgoing_cltv = i;
|
||||
}
|
||||
|
||||
struct onionpacket *res = create_onionpacket(ctx,
|
||||
path,
|
||||
hops_data,
|
||||
sessionkey,
|
||||
assocdata,
|
||||
sizeof(assocdata),
|
||||
&shared_secrets);
|
||||
|
||||
u8 *serialized = serialize_onionpacket(ctx, res);
|
||||
if (!serialized)
|
||||
errx(1, "Error serializing message.");
|
||||
|
||||
char hextemp[2 * tal_count(serialized) + 1];
|
||||
hex_encode(serialized, tal_count(serialized), hextemp, sizeof(hextemp));
|
||||
printf("%s\n", hextemp);
|
||||
|
||||
} else if (decode) {
|
||||
struct route_step *step;
|
||||
struct onionpacket *msg;
|
||||
struct privkey seckey;
|
||||
const tal_t *ctx = talz(NULL, tal_t);
|
||||
u8 serialized[TOTAL_PACKET_SIZE];
|
||||
char hextemp[2 * sizeof(serialized) + 1];
|
||||
memset(hextemp, 0, sizeof(hextemp));
|
||||
u8 shared_secret[32];
|
||||
|
||||
if (argc != 2)
|
||||
opt_usage_exit_fail("Expect a privkey with --decode");
|
||||
if (!hex_decode(argv[1], strlen(argv[1]), &seckey, sizeof(seckey)))
|
||||
errx(1, "Invalid private key hex '%s'", argv[1]);
|
||||
if (!read_all(STDIN_FILENO, hextemp, sizeof(hextemp)))
|
||||
errx(1, "Reading in onion");
|
||||
hex_decode(hextemp, sizeof(hextemp), serialized, sizeof(serialized));
|
||||
|
||||
msg = parse_onionpacket(ctx, serialized, sizeof(serialized));
|
||||
if (!msg)
|
||||
errx(1, "Error parsing message.");
|
||||
|
||||
if (!onion_shared_secret(shared_secret, msg, &seckey))
|
||||
errx(1, "Error creating shared secret.");
|
||||
|
||||
step = process_onionpacket(ctx, msg, shared_secret, assocdata,
|
||||
sizeof(assocdata));
|
||||
|
||||
if (!step->next)
|
||||
errx(1, "Error processing message.");
|
||||
|
||||
u8 *ser = serialize_onionpacket(ctx, step->next);
|
||||
if (!ser)
|
||||
errx(1, "Error serializing message.");
|
||||
|
||||
hex_encode(ser, tal_count(ser), hextemp, sizeof(hextemp));
|
||||
printf("%s\n", hextemp);
|
||||
}
|
||||
secp256k1_context_destroy(secp256k1_ctx);
|
||||
opt_free_table();
|
||||
|
||||
@ -11,7 +11,7 @@ DEVTOOLS_COMMON_OBJS := \
|
||||
common/utils.o \
|
||||
common/version.o
|
||||
|
||||
devtools-all: devtools/bolt11-cli devtools/decodemsg
|
||||
devtools-all: devtools/bolt11-cli devtools/decodemsg devtools/onion
|
||||
|
||||
devtools/gen_print_wire.h: $(WIRE_GEN) wire/gen_peer_wire_csv
|
||||
$(WIRE_GEN) --bolt --printwire --header $@ wire_type < wire/gen_peer_wire_csv > $@
|
||||
@ -23,11 +23,13 @@ devtools/bolt11-cli: $(DEVTOOLS_OBJS) $(DEVTOOLS_COMMON_OBJS) $(JSMN_OBJS) $(CCA
|
||||
|
||||
devtools/decodemsg: $(DEVTOOLS_OBJS) $(DEVTOOLS_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) $(BITCOIN_OBJS) wire/fromwire.o wire/towire.o devtools/decodemsg.o
|
||||
|
||||
devtools/onion: $(DEVTOOLS_OBJS) $(DEVTOOLS_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) $(BITCOIN_OBJS) wire/fromwire.o wire/towire.o devtools/onion.o common/sphinx.o
|
||||
|
||||
$(DEVTOOLS_OBJS) $(DEVTOOLS_TOOL_OBJS): wire/wire.h devtools/gen_print_wire.h
|
||||
devtools/gen_print_wire.o: devtools/gen_print_wire.h wire/gen_peer_wire.h
|
||||
|
||||
# Make sure these depend on everything.
|
||||
ALL_PROGRAMS += devtools/bolt11-cli devtools/decodemsg
|
||||
ALL_PROGRAMS += devtools/bolt11-cli devtools/decodemsg devtools/onion
|
||||
ALL_OBJS += $(DEVTOOLS_OBJS) $(DEVTOOLS_TOOL_OBJS)
|
||||
|
||||
check-source: $(DEVTOOLS_SRC:%=check-src-include-order/%) $(DEVTOOLS_TOOLS_SRC:%=check-src-include-order/%)
|
||||
@ -36,4 +38,3 @@ clean: devtools-clean
|
||||
|
||||
devtools-clean:
|
||||
$(RM) $(DEVTOOLS_CLI_OBJS)
|
||||
|
||||
|
||||
120
devtools/onion.c
Normal file
120
devtools/onion.c
Normal file
@ -0,0 +1,120 @@
|
||||
#include <ccan/opt/opt.h>
|
||||
#include <ccan/read_write_all/read_write_all.h>
|
||||
#include <ccan/short_types/short_types.h>
|
||||
#include <ccan/str/hex/hex.h>
|
||||
#include <common/sphinx.h>
|
||||
#include <common/utils.h>
|
||||
#include <err.h>
|
||||
#include <secp256k1.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
static void do_generate(int argc, char **argv)
|
||||
{
|
||||
const tal_t *ctx = talz(NULL, tal_t);
|
||||
int num_hops = argc - 1;
|
||||
struct pubkey *path = tal_arr(ctx, struct pubkey, num_hops);
|
||||
u8 privkeys[argc - 1][32];
|
||||
u8 sessionkey[32];
|
||||
struct hop_data hops_data[num_hops];
|
||||
struct secret *shared_secrets;
|
||||
u8 assocdata[32];
|
||||
|
||||
memset(&sessionkey, 'A', sizeof(sessionkey));
|
||||
memset(&assocdata, 'B', sizeof(assocdata));
|
||||
|
||||
for (int i = 0; i < num_hops; i++) {
|
||||
hex_decode(argv[1 + i], 66, privkeys[i], 33);
|
||||
if (secp256k1_ec_pubkey_create(secp256k1_ctx, &path[i].pubkey,
|
||||
privkeys[i]) != 1)
|
||||
errx(1, "Could not decode pubkey");
|
||||
}
|
||||
|
||||
for (int i = 0; i < num_hops; i++) {
|
||||
memset(&hops_data[i], 0, sizeof(hops_data[i]));
|
||||
hops_data[i].realm = i;
|
||||
memset(&hops_data[i].channel_id, i,
|
||||
sizeof(hops_data[i].channel_id));
|
||||
hops_data[i].amt_forward = i;
|
||||
hops_data[i].outgoing_cltv = i;
|
||||
printf("Hopdata %d: %s\n", i, tal_hexstr(NULL, &hops_data[i], sizeof(hops_data[i])));
|
||||
}
|
||||
|
||||
struct onionpacket *res =
|
||||
create_onionpacket(ctx, path, hops_data, sessionkey, assocdata,
|
||||
sizeof(assocdata), &shared_secrets);
|
||||
|
||||
u8 *serialized = serialize_onionpacket(ctx, res);
|
||||
if (!serialized)
|
||||
errx(1, "Error serializing message.");
|
||||
|
||||
char hextemp[2 * tal_count(serialized) + 1];
|
||||
hex_encode(serialized, tal_count(serialized), hextemp, sizeof(hextemp));
|
||||
printf("%s\n", hextemp);
|
||||
}
|
||||
|
||||
static void do_decode(int argc, char **argv)
|
||||
{
|
||||
struct route_step *step;
|
||||
struct onionpacket *msg;
|
||||
struct privkey seckey;
|
||||
const tal_t *ctx = talz(NULL, tal_t);
|
||||
u8 serialized[TOTAL_PACKET_SIZE];
|
||||
char hextemp[2 * sizeof(serialized) + 1];
|
||||
memset(hextemp, 0, sizeof(hextemp));
|
||||
u8 shared_secret[32];
|
||||
u8 assocdata[32];
|
||||
|
||||
if (argc != 2)
|
||||
opt_usage_exit_fail("Expect a privkey with --decode");
|
||||
if (!hex_decode(argv[1], strlen(argv[1]), &seckey, sizeof(seckey)))
|
||||
errx(1, "Invalid private key hex '%s'", argv[1]);
|
||||
if (!read_all(STDIN_FILENO, hextemp, sizeof(hextemp)))
|
||||
errx(1, "Reading in onion");
|
||||
hex_decode(hextemp, sizeof(hextemp), serialized, sizeof(serialized));
|
||||
|
||||
msg = parse_onionpacket(ctx, serialized, sizeof(serialized));
|
||||
if (!msg)
|
||||
errx(1, "Error parsing message.");
|
||||
|
||||
if (!onion_shared_secret(shared_secret, msg, &seckey))
|
||||
errx(1, "Error creating shared secret.");
|
||||
|
||||
step = process_onionpacket(ctx, msg, shared_secret, assocdata,
|
||||
sizeof(assocdata));
|
||||
|
||||
if (!step->next)
|
||||
errx(1, "Error processing message.");
|
||||
|
||||
u8 *ser = serialize_onionpacket(ctx, step->next);
|
||||
if (!ser)
|
||||
errx(1, "Error serializing message.");
|
||||
|
||||
hex_encode(ser, tal_count(ser), hextemp, sizeof(hextemp));
|
||||
printf("%s\n", hextemp);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
bool generate = false, decode = false;
|
||||
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY |
|
||||
SECP256K1_CONTEXT_SIGN);
|
||||
|
||||
opt_register_noarg("--help|-h", opt_usage_and_exit,
|
||||
"--generate <pubkey1> <pubkey2>... OR\n"
|
||||
"--decode <privkey>\n"
|
||||
"Either create an onion message, or decode one step",
|
||||
"Print this message.");
|
||||
opt_register_noarg("--generate", opt_set_bool, &generate,
|
||||
"Generate onion through the given hex pubkeys");
|
||||
opt_register_noarg("--decode", opt_set_bool, &decode,
|
||||
"Decode onion from stdin given the private key");
|
||||
|
||||
opt_parse(&argc, argv, opt_log_stderr_exit);
|
||||
|
||||
if (generate)
|
||||
do_generate(argc, argv);
|
||||
else if (decode)
|
||||
do_decode(argc, argv);
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user