aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Buchman <ethan@coinculture.info>2015-07-14 10:21:02 +0800
committerEthan Buchman <ethan@coinculture.info>2015-07-14 11:06:44 +0800
commit37efd08b42f595eac8146b6b81f3f36e2e6f340d (patch)
treefe5824131381a84a9b3e3633a7ed04b10790bfff
parent796c18db93add1d145db99d6088e445a56851e8b (diff)
downloaddexon-37efd08b42f595eac8146b6b81f3f36e2e6f340d.tar
dexon-37efd08b42f595eac8146b6b81f3f36e2e6f340d.tar.gz
dexon-37efd08b42f595eac8146b6b81f3f36e2e6f340d.tar.bz2
dexon-37efd08b42f595eac8146b6b81f3f36e2e6f340d.tar.lz
dexon-37efd08b42f595eac8146b6b81f3f36e2e6f340d.tar.xz
dexon-37efd08b42f595eac8146b6b81f3f36e2e6f340d.tar.zst
dexon-37efd08b42f595eac8146b6b81f3f36e2e6f340d.zip
p2p: validate recovered ephemeral pubkey against checksum in decodeAuthMsg
-rw-r--r--p2p/rlpx.go16
1 files changed, 12 insertions, 4 deletions
diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index eca3d9ed6..3e3589c49 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -267,6 +267,10 @@ func initiatorEncHandshake(conn io.ReadWriter, prv *ecdsa.PrivateKey, remoteID d
}
func newInitiatorHandshake(remoteID discover.NodeID) (*encHandshake, error) {
+ rpub, err := remoteID.Pubkey()
+ if err != nil {
+ return nil, fmt.Errorf("bad remoteID: %v", err)
+ }
// generate random initiator nonce
n := make([]byte, shaLen)
if _, err := rand.Read(n); err != nil {
@@ -277,10 +281,6 @@ func newInitiatorHandshake(remoteID discover.NodeID) (*encHandshake, error) {
if err != nil {
return nil, err
}
- rpub, err := remoteID.Pubkey()
- if err != nil {
- return nil, fmt.Errorf("bad remoteID: %v", err)
- }
h := &encHandshake{
initiator: true,
remoteID: remoteID,
@@ -417,6 +417,14 @@ func decodeAuthMsg(prv *ecdsa.PrivateKey, token []byte, auth []byte) (*encHandsh
if err != nil {
return nil, err
}
+
+ // validate the sha3 of recovered pubkey
+ remoteRandomPubMAC := msg[sigLen : sigLen+shaLen]
+ shaRemoteRandomPub := crypto.Sha3(remoteRandomPub[1:])
+ if !bytes.Equal(remoteRandomPubMAC, shaRemoteRandomPub) {
+ return nil, fmt.Errorf("sha3 of recovered ephemeral pubkey does not match checksum in auth message")
+ }
+
h.remoteRandomPub, _ = importPublicKey(remoteRandomPub)
return h, nil
}