mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

hsm: Remove special case of hsmfd_ecdh, replaced with client and cap

Browse Source 
Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker 2017-11-28 17:14:52 +01:00
parent 5482acb837
commit 6ce264d3a2
3 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hsmd/hsm.c
View File

@ -498,27 +498,6 @@ static void pass_client_hsmfd(struct daemon_conn *master, const u8 *msg)
daemon_conn_send_fd(master, fds[1]); daemon_conn_send_fd(master, fds[1]);
} }
static void pass_hsmfd_ecdh(struct daemon_conn *master, const u8 *msg)
{
int fds[2];
struct pubkey id;
if (!fromwire_hsmctl_hsmfd_ecdh(msg, NULL))
master_badmsg(WIRE_HSMCTL_HSMFD_ECDH, msg);
if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) != 0)
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"creating fds: %s", strerror(errno));
/* This is gossipd, so we use our own id */
node_key(NULL, &id);
new_client(master, &id, HSM_CAP_ECDH, handle_ecdh, fds[0]);
daemon_conn_send(master,
take(towire_hsmctl_hsmfd_ecdh_fd_reply(master)));
daemon_conn_send_fd(master, fds[1]);
}
/* Reply to an incoming request for an HSMFD for a channeld. */ /* Reply to an incoming request for an HSMFD for a channeld. */
static void pass_hsmfd_channeld(struct daemon_conn *master, const u8 *msg) static void pass_hsmfd_channeld(struct daemon_conn *master, const u8 *msg)
{ {
@ -745,9 +724,6 @@ static struct io_plan *control_received_req(struct io_conn *conn,
case WIRE_HSMCTL_CLIENT_HSMFD: case WIRE_HSMCTL_CLIENT_HSMFD:
pass_client_hsmfd(master, master->msg_in); pass_client_hsmfd(master, master->msg_in);
return daemon_conn_read_next(conn, master); return daemon_conn_read_next(conn, master);
case WIRE_HSMCTL_HSMFD_ECDH:
pass_hsmfd_ecdh(master, master->msg_in);
return daemon_conn_read_next(conn, master);
case WIRE_HSMCTL_HSMFD_CHANNELD: case WIRE_HSMCTL_HSMFD_CHANNELD:
pass_hsmfd_channeld(master, master->msg_in); pass_hsmfd_channeld(master, master->msg_in);
return daemon_conn_read_next(conn, master); return daemon_conn_read_next(conn, master);
@ -769,7 +745,6 @@ static struct io_plan *control_received_req(struct io_conn *conn,
case WIRE_HSMCTL_INIT_REPLY: case WIRE_HSMCTL_INIT_REPLY:
case WIRE_HSMCTL_CLIENT_HSMFD_REPLY: case WIRE_HSMCTL_CLIENT_HSMFD_REPLY:
case WIRE_HSMCTL_HSMFD_ECDH_FD_REPLY:
case WIRE_HSMCTL_HSMFD_CHANNELD_REPLY: case WIRE_HSMCTL_HSMFD_CHANNELD_REPLY:
case WIRE_HSMCTL_SIGN_FUNDING_REPLY: case WIRE_HSMCTL_SIGN_FUNDING_REPLY:
case WIRE_HSMCTL_SIGN_WITHDRAWAL_REPLY: case WIRE_HSMCTL_SIGN_WITHDRAWAL_REPLY:

8
hsmd/hsm_wire.csv
View File

@ -22,12 +22,6 @@ hsmctl_client_hsmfd,,capabilities,u64
# No content, just an fd. # No content, just an fd.
hsmctl_client_hsmfd_reply,109 hsmctl_client_hsmfd_reply,109
# ECDH returns an fd (for gossipd to do handshake)
hsmctl_hsmfd_ecdh,3
# No contents, just an fd.
hsmctl_hsmfd_ecdh_fd_reply,103
# Return signature for a funding tx. # Return signature for a funding tx.
#include <common/utxo.h> #include <common/utxo.h>
# FIXME: This should also take their commit sig & details, to verify. # FIXME: This should also take their commit sig & details, to verify.
@ -44,7 +38,7 @@ hsmctl_sign_funding_reply,104
hsmctl_sign_funding_reply,,num_sigs,u16 hsmctl_sign_funding_reply,,num_sigs,u16
hsmctl_sign_funding_reply,,sig,num_sigs*secp256k1_ecdsa_signature hsmctl_sign_funding_reply,,sig,num_sigs*secp256k1_ecdsa_signature
# Request a client socket for a `channeld`, allows signing announcements # Request a client socket for a `channeld`, allows signing announcements
hsmctl_hsmfd_channeld,5 hsmctl_hsmfd_channeld,5
hsmctl_hsmfd_channeld,,id,struct pubkey hsmctl_hsmfd_channeld,,id,struct pubkey

1 # Clients should not give a bad request but not the HSM's decision to crash.
22 # No contents, just an fd. # FIXME: This should also take their commit sig & details, to verify.
23 hsmctl_hsmfd_ecdh_fd_reply,103 hsmctl_sign_funding,4
24 # Return signature for a funding tx. hsmctl_sign_funding,,satoshi_out,u64
#include <common/utxo.h>
# FIXME: This should also take their commit sig & details, to verify.
hsmctl_sign_funding,4
hsmctl_sign_funding,,satoshi_out,u64
hsmctl_sign_funding,,change_out,u64
hsmctl_sign_funding,,change_keyindex,u32
25 hsmctl_sign_funding,,our_pubkey,struct pubkey hsmctl_sign_funding,,change_out,u64
26 hsmctl_sign_funding,,their_pubkey,struct pubkey hsmctl_sign_funding,,change_keyindex,u32
27 hsmctl_sign_funding,,num_inputs,u16 hsmctl_sign_funding,,our_pubkey,struct pubkey
38 hsmctl_node_announcement_sig_req,6 hsmctl_hsmfd_channeld_reply,105
39 hsmctl_node_announcement_sig_req,,annlen,u16 # Master asks the HSM to sign a node_announcement
40 hsmctl_node_announcement_sig_req,,announcement,annlen*u8 hsmctl_node_announcement_sig_req,6
41 hsmctl_node_announcement_sig_reply,106 hsmctl_node_announcement_sig_req,,annlen,u16
42 hsmctl_node_announcement_sig_reply,,signature,secp256k1_ecdsa_signature hsmctl_node_announcement_sig_req,,announcement,annlen*u8
43 # Sign a withdrawal request hsmctl_node_announcement_sig_reply,106
44 hsmctl_sign_withdrawal,7 hsmctl_node_announcement_sig_reply,,signature,secp256k1_ecdsa_signature

6
lightningd/gossip_control.c
View File

@ -10,6 +10,7 @@
#include <common/utils.h> #include <common/utils.h>
#include <errno.h> #include <errno.h>
#include <gossipd/gen_gossip_wire.h> #include <gossipd/gen_gossip_wire.h>
#include <hsmd/capabilities.h>
#include <hsmd/gen_hsm_wire.h> #include <hsmd/gen_hsm_wire.h>
#include <inttypes.h> #include <inttypes.h>
#include <lightningd/gossip_msg.h> #include <lightningd/gossip_msg.h>
@ -101,13 +102,14 @@ void gossip_init(struct lightningd *ld)
tal_t *tmpctx = tal_tmpctx(ld); tal_t *tmpctx = tal_tmpctx(ld);
u8 *msg; u8 *msg;
int hsmfd; int hsmfd;
u64 capabilities = HSM_CAP_ECDH | HSM_CAP_SIGN_GOSSIP;
msg = towire_hsmctl_hsmfd_ecdh(tmpctx); msg = towire_hsmctl_client_hsmfd(tmpctx, &ld->id, capabilities);
if (!wire_sync_write(ld->hsm_fd, msg)) if (!wire_sync_write(ld->hsm_fd, msg))
fatal("Could not write to HSM: %s", strerror(errno)); fatal("Could not write to HSM: %s", strerror(errno));
msg = hsm_sync_read(tmpctx, ld); msg = hsm_sync_read(tmpctx, ld);
if (!fromwire_hsmctl_hsmfd_ecdh_fd_reply(msg, NULL)) if (!fromwire_hsmctl_client_hsmfd_reply(msg, NULL))
fatal("Malformed hsmfd response: %s", tal_hex(msg, msg)); fatal("Malformed hsmfd response: %s", tal_hex(msg, msg));
hsmfd = fdpass_recv(ld->hsm_fd); hsmfd = fdpass_recv(ld->hsm_fd);