From 6e5175373e2b9f6e9253c57ef81ca2fdd5f5f80a Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@tailscale.com>
Date: Thu, 28 Oct 2021 10:44:34 -0700
Subject: [PATCH] types/netmap: use new node key type.

Signed-off-by: David Anderson <danderson@tailscale.com>
---
 control/controlclient/map.go         | 3 ++-
 types/netmap/netmap.go               | 3 +--
 wgengine/bench/wg.go                 | 4 ++--
 wgengine/magicsock/magicsock_test.go | 2 +-
 wgengine/wgcfg/nmcfg/nmcfg.go        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/control/controlclient/map.go b/control/controlclient/map.go
index cdeca1248..874a0c6e6 100644
--- a/control/controlclient/map.go
+++ b/control/controlclient/map.go
@@ -10,6 +10,7 @@ import (
 	"sort"
 	"strconv"
 
+	"go4.org/mem"
 	"inet.af/netaddr"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/key"
@@ -112,7 +113,7 @@ func (ms *mapSession) netmapForResponse(resp *tailcfg.MapResponse) *netmap.Netwo
 
 	nm := &netmap.NetworkMap{
 		NodeKey:         tailcfg.NodeKey(ms.privateNodeKey.Public()),
-		PrivateKey:      ms.privateNodeKey,
+		PrivateKey:      key.NodePrivateFromRaw32(mem.B(ms.privateNodeKey[:])),
 		MachineKey:      ms.machinePubKey,
 		Peers:           resp.Peers,
 		UserProfiles:    make(map[tailcfg.UserID]tailcfg.UserProfile),
diff --git a/types/netmap/netmap.go b/types/netmap/netmap.go
index 5eec06c6f..90be66196 100644
--- a/types/netmap/netmap.go
+++ b/types/netmap/netmap.go
@@ -15,7 +15,6 @@ import (
 	"inet.af/netaddr"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/key"
-	"tailscale.com/types/wgkey"
 	"tailscale.com/wgengine/filter"
 )
 
@@ -28,7 +27,7 @@ type NetworkMap struct {
 
 	SelfNode   *tailcfg.Node
 	NodeKey    tailcfg.NodeKey
-	PrivateKey wgkey.Private
+	PrivateKey key.NodePrivate
 	Expiry     time.Time
 	// Name is the DNS name assigned to this node.
 	Name          string
diff --git a/wgengine/bench/wg.go b/wgengine/bench/wg.go
index 2d8c83540..7321b10d0 100644
--- a/wgengine/bench/wg.go
+++ b/wgengine/bench/wg.go
@@ -106,7 +106,7 @@ func setupWGTest(b *testing.B, logf logger.Logf, traf *TrafficGen, a1, a2 netadd
 		}
 		e2.SetNetworkMap(&netmap.NetworkMap{
 			NodeKey:    tailcfg.NodeKeyFromNodePublic(k2.Public()),
-			PrivateKey: k2.AsWGPrivate(),
+			PrivateKey: k2,
 			Peers:      []*tailcfg.Node{&n},
 		})
 
@@ -143,7 +143,7 @@ func setupWGTest(b *testing.B, logf logger.Logf, traf *TrafficGen, a1, a2 netadd
 		}
 		e1.SetNetworkMap(&netmap.NetworkMap{
 			NodeKey:    tailcfg.NodeKeyFromNodePublic(k1.Public()),
-			PrivateKey: k1.AsWGPrivate(),
+			PrivateKey: k1,
 			Peers:      []*tailcfg.Node{&n},
 		})
 
diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go
index 7803d579c..4ef0ce753 100644
--- a/wgengine/magicsock/magicsock_test.go
+++ b/wgengine/magicsock/magicsock_test.go
@@ -256,7 +256,7 @@ func meshStacks(logf logger.Logf, mutateNetmap func(idx int, nm *netmap.NetworkM
 	buildNetmapLocked := func(myIdx int) *netmap.NetworkMap {
 		me := ms[myIdx]
 		nm := &netmap.NetworkMap{
-			PrivateKey: me.privateKey,
+			PrivateKey: key.NodePrivateFromRaw32(mem.B(me.privateKey[:])),
 			NodeKey:    tailcfg.NodeKey(me.privateKey.Public()),
 			Addresses:  []netaddr.IPPrefix{netaddr.IPPrefixFrom(netaddr.IPv4(1, 0, 0, byte(myIdx+1)), 32)},
 		}
diff --git a/wgengine/wgcfg/nmcfg/nmcfg.go b/wgengine/wgcfg/nmcfg/nmcfg.go
index 40a1e44e4..e7fea2fa7 100644
--- a/wgengine/wgcfg/nmcfg/nmcfg.go
+++ b/wgengine/wgcfg/nmcfg/nmcfg.go
@@ -55,7 +55,7 @@ func cidrIsSubnet(node *tailcfg.Node, cidr netaddr.IPPrefix) bool {
 func WGCfg(nm *netmap.NetworkMap, logf logger.Logf, flags netmap.WGConfigFlags, exitNode tailcfg.StableNodeID) (*wgcfg.Config, error) {
 	cfg := &wgcfg.Config{
 		Name:       "tailscale",
-		PrivateKey: key.NodePrivateFromRaw32(mem.B(nm.PrivateKey[:])),
+		PrivateKey: nm.PrivateKey,
 		Addresses:  nm.Addresses,
 		Peers:      make([]wgcfg.Peer, 0, len(nm.Peers)),
 	}