From cdea5108db34f011664bcab600779a0a426cdb6a Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Sun, 8 Mar 2020 15:25:30 +0100
Subject: [PATCH] p2p/discover: fix lint

---
 p2p/discover/node.go             | 2 +-
 p2p/discover/v5_encoding.go      | 6 +++---
 p2p/discover/v5_encoding_test.go | 2 +-
 p2p/discover/v5_udp.go           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/p2p/discover/node.go b/p2p/discover/node.go
index bdcbbaedec..230638b6d1 100644
--- a/p2p/discover/node.go
+++ b/p2p/discover/node.go
@@ -18,11 +18,11 @@ package discover
 
 import (
 	"crypto/ecdsa"
+	"crypto/elliptic"
 	"errors"
 	"math/big"
 	"net"
 	"time"
-	"crypto/elliptic"
 
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/crypto"
diff --git a/p2p/discover/v5_encoding.go b/p2p/discover/v5_encoding.go
index 0c877a7406..78cf74e687 100644
--- a/p2p/discover/v5_encoding.go
+++ b/p2p/discover/v5_encoding.go
@@ -384,9 +384,9 @@ func (c *wireCodec) deriveKeys(n1, n2 enode.ID, priv *ecdsa.PrivateKey, pub *ecd
 	info = append(info, n2[:]...)
 	kdf := hkdf.New(c.sha256reset, eph, challenge.IDNonce[:], info)
 	sec := handshakeSecrets{
-		writeKey:    make([]byte, 16),
-		readKey:     make([]byte, 16),
-		authRespKey: make([]byte, 16),
+		writeKey:    make([]byte, aesKeySize),
+		readKey:     make([]byte, aesKeySize),
+		authRespKey: make([]byte, aesKeySize),
 	}
 	kdf.Read(sec.writeKey)
 	kdf.Read(sec.readKey)
diff --git a/p2p/discover/v5_encoding_test.go b/p2p/discover/v5_encoding_test.go
index 2da3c21e59..e2253cde47 100644
--- a/p2p/discover/v5_encoding_test.go
+++ b/p2p/discover/v5_encoding_test.go
@@ -91,7 +91,7 @@ func TestHandshakeV5(t *testing.T) {
 	net.nodeA.expectDecode(t, p_nodesV5, nodes)
 }
 
-// This test checks that handshake attempts are removed withing the timeout.
+// This test checks that handshake attempts are removed within the timeout.
 func TestHandshakeV5_timeout(t *testing.T) {
 	t.Parallel()
 	net := newHandshakeTest()
diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go
index 5df1e16293..52967bb170 100644
--- a/p2p/discover/v5_udp.go
+++ b/p2p/discover/v5_udp.go
@@ -585,7 +585,7 @@ func (t *UDPv5) handlePacket(rawpacket []byte, fromAddr *net.UDPAddr) error {
 		return err
 	}
 	if fromNode != nil {
-		// Handshake suceeded, add to table.
+		// Handshake succeeded, add to table.
 		t.tab.addSeenNode(wrapNode(fromNode))
 	}
 	if packet.kind() != p_whoareyouV5 {