From c6867e0b16100fefea6d7e7985828d70462d213a Mon Sep 17 00:00:00 2001 From: eyedeekay Date: Tue, 25 Feb 2025 16:15:18 -0500 Subject: [PATCH] more keystore work --- lib/keys/routerinfo_keystore.go | 1 + lib/router/router.go | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/keys/routerinfo_keystore.go b/lib/keys/routerinfo_keystore.go index d918cca..ed01198 100644 --- a/lib/keys/routerinfo_keystore.go +++ b/lib/keys/routerinfo_keystore.go @@ -152,6 +152,7 @@ func (ks *RouterInfoKeystore) ConstructRouterInfo(addresses []*router_address.Ro if err != nil { return nil, err } + pubKeySize := keyCert.CryptoSize() sigKeySize := keyCert.SignatureSize() paddingSize := keys_and_cert.KEYS_AND_CERT_DATA_SIZE - (pubKeySize + sigKeySize) diff --git a/lib/router/router.go b/lib/router/router.go index 412b335..887c4bf 100644 --- a/lib/router/router.go +++ b/lib/router/router.go @@ -66,8 +66,17 @@ func CreateRouter(cfg *config.RouterConfig) (*Router, error) { // sha256 hash of public key pubHash := sha256.Sum256(pub.Bytes()) b32PubHash := base32.EncodeToString(pubHash[:]) - log.Debug("Router public hash:", b32PubHash) + log.Debug("Router public key hash:", b32PubHash) } + ri, err := r.RouterInfoKeystore.ConstructRouterInfo(nil) + if err != nil { + log.WithError(err).Error("Failed to construct RouterInfo") + return nil, err + } else { + log.Debug("RouterInfo constructed successfully") + log.Debug("RouterInfo:", ri) + } + r.TransportMuxer = transport.Mux() return r, err