Revert "types/key: add MachinePrivate and MachinePublic."

Broke the tailscale control plane due to surprise different serialization.

This reverts commit 4fdb88efe1.

tailcfg/tailcfg.go

@@ -77,6 +77,9 @@ func (u StableNodeID) IsZero() bool {
 	return u == ""
 }
 
+// MachineKey is the curve25519 public key for a machine.
+type MachineKey [32]byte
+
 // NodeKey is the curve25519 public key for a node.
 type NodeKey [32]byte
 
@@ -154,7 +157,7 @@ type Node struct {
 
 	Key        NodeKey
 	KeyExpiry  time.Time
-	Machine    key.MachinePublic
+	Machine    MachineKey
 	DiscoKey   DiscoKey
 	Addresses  []netaddr.IPPrefix // IP addresses of this Node directly
 	AllowedIPs []netaddr.IPPrefix // range of IP addresses to route to this node
@@ -1075,6 +1078,11 @@ type Debug struct {
 	DisableUPnP opt.Bool `json:",omitempty"`
 }
 
+func (k MachineKey) String() string                   { return fmt.Sprintf("mkey:%x", k[:]) }
+func (k MachineKey) MarshalText() ([]byte, error)     { return keyMarshalText("mkey:", k), nil }
+func (k MachineKey) HexString() string                { return fmt.Sprintf("%x", k[:]) }
+func (k *MachineKey) UnmarshalText(text []byte) error { return keyUnmarshalText(k[:], "mkey:", text) }
+
 func appendKey(base []byte, prefix string, k [32]byte) []byte {
 	ret := append(base, make([]byte, len(prefix)+64)...)
 	buf := ret[len(base):]
@@ -1108,6 +1116,9 @@ func (k *NodeKey) UnmarshalText(text []byte) error { return keyUnmarshalText(k[:
 // IsZero reports whether k is the zero value.
 func (k NodeKey) IsZero() bool { return k == NodeKey{} }
 
+// IsZero reports whether k is the zero value.
+func (k MachineKey) IsZero() bool { return k == MachineKey{} }
+
 func (k DiscoKey) String() string                   { return fmt.Sprintf("discokey:%x", k[:]) }
 func (k DiscoKey) MarshalText() ([]byte, error)     { return keyMarshalText("discokey:", k), nil }
 func (k *DiscoKey) UnmarshalText(text []byte) error { return keyUnmarshalText(k[:], "discokey:", text) }

tailcfg/tailcfg_clone.go

@@ -9,7 +9,6 @@ package tailcfg
 import (
 	"inet.af/netaddr"
 	"tailscale.com/types/dnstype"
-	"tailscale.com/types/key"
 	"tailscale.com/types/opt"
 	"tailscale.com/types/structs"
 	"time"
@@ -74,7 +73,7 @@ var _NodeNeedsRegeneration = Node(struct {
 	Sharer                  UserID
 	Key                     NodeKey
 	KeyExpiry               time.Time
-	Machine                 key.MachinePublic
+	Machine                 MachineKey
 	DiscoKey                DiscoKey
 	Addresses               []netaddr.IPPrefix
 	AllowedIPs              []netaddr.IPPrefix

tailcfg/tailcfg_test.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"inet.af/netaddr"
-	"tailscale.com/types/key"
 	"tailscale.com/types/wgkey"
 	"tailscale.com/version"
 )
@@ -214,7 +213,6 @@ func TestNodeEqual(t *testing.T) {
 		return k.Public()
 	}
 	n1 := newPublicKey(t)
-	m1 := key.NewMachine().Public()
 	now := time.Now()
 
 	tests := []struct {
@@ -292,13 +290,13 @@ func TestNodeEqual(t *testing.T) {
 			true,
 		},
 		{
-			&Node{Machine: m1},
-			&Node{Machine: key.NewMachine().Public()},
+			&Node{Machine: MachineKey(n1)},
+			&Node{Machine: MachineKey(newPublicKey(t))},
 			false,
 		},
 		{
-			&Node{Machine: m1},
-			&Node{Machine: m1},
+			&Node{Machine: MachineKey(n1)},
+			&Node{Machine: MachineKey(n1)},
 			true,
 		},
 		{
@@ -395,6 +393,14 @@ func TestNetInfoFields(t *testing.T) {
 	}
 }
 
+func TestMachineKeyMarshal(t *testing.T) {
+	var k1, k2 MachineKey
+	for i := range k1 {
+		k1[i] = byte(i)
+	}
+	testKey(t, "mkey:", k1, &k2)
+}
+
 func TestNodeKeyMarshal(t *testing.T) {
 	var k1, k2 NodeKey
 	for i := range k1 {