From ccd36cb5b18f6a9dd9010a558a54c4e0e3152fdd Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 29 Oct 2021 14:57:32 -0700 Subject: [PATCH] wgengine: remove use of legacy key parsing helper. Updates #3206 Signed-off-by: David Anderson --- wgengine/userspace.go | 4 ++-- wgengine/userspace_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wgengine/userspace.go b/wgengine/userspace.go index 53d1e3eba..1112b87ef 100644 --- a/wgengine/userspace.go +++ b/wgengine/userspace.go @@ -1007,14 +1007,14 @@ func (e *userspaceEngine) getStatus() (*Status, error) { } switch string(k) { case "public_key": - pk, err := key.NewPublicFromHexMem(v) + pk, err := key.ParseNodePublicUntyped(v) if err != nil { return nil, fmt.Errorf("IpcGetOperation: invalid key in line %q", line) } if !p.NodeKey.IsZero() { pp[p.NodeKey] = p } - p = ipnstate.PeerStatusLite{NodeKey: tailcfg.NodeKey(pk)} + p = ipnstate.PeerStatusLite{NodeKey: tailcfg.NodeKeyFromNodePublic(pk)} case "rx_bytes": n, err = mem.ParseInt(v, 10, 64) p.RxBytes = n diff --git a/wgengine/userspace_test.go b/wgengine/userspace_test.go index c2777f53d..a88c7bfb3 100644 --- a/wgengine/userspace_test.go +++ b/wgengine/userspace_test.go @@ -213,11 +213,11 @@ func nkFromHex(hex string) tailcfg.NodeKey { if len(hex) != 64 { panic(fmt.Sprintf("%q is len %d; want 64", hex, len(hex))) } - k, err := key.NewPublicFromHexMem(mem.S(hex[:64])) + k, err := key.ParseNodePublicUntyped(mem.S(hex[:64])) if err != nil { panic(fmt.Sprintf("%q is not hex: %v", hex, err)) } - return tailcfg.NodeKey(k) + return tailcfg.NodeKeyFromNodePublic(k) } // an experiment to see if genLocalAddrFunc was worth it. As of Go