control/noise: use key.Machine{Public,Private} as appropriate.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2021-10-25 16:41:30 -07:00
committed by Dave Anderson
parent edb33d65c3
commit 293431aaea
8 changed files with 126 additions and 119 deletions

View File

@ -197,8 +197,8 @@ func TestConnStd(t *testing.T) {
t.Skip("not all tests can pass on this Conn, see https://github.com/golang/go/issues/46977")
nettest.TestConn(t, func() (c1 net.Conn, c2 net.Conn, stop func(), err error) {
s1, s2 := tsnettest.NewConn("noise", 4096)
controlKey := key.NewPrivate()
machineKey := key.NewPrivate()
controlKey := key.NewMachine()
machineKey := key.NewMachine()
serverErr := make(chan error, 1)
go func() {
var err error
@ -312,8 +312,8 @@ func (s *readSink) Total() int {
func pairWithConns(t *testing.T, clientConn, serverConn net.Conn) (*Conn, *Conn) {
var (
controlKey = key.NewPrivate()
machineKey = key.NewPrivate()
controlKey = key.NewMachine()
machineKey = key.NewMachine()
server *Conn
serverErr = make(chan error, 1)
)