roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #1470 from ebuchman/encHandshake

Browse Source 
p2p: validate recovered ephemeral pubkey
This commit is contained in:
Felix Lange 2015-08-13 11:59:27 +02:00
commit a89cfe92cc
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
p2p/rlpx.go
View File

@ -267,6 +267,10 @@ func initiatorEncHandshake(conn io.ReadWriter, prv *ecdsa.PrivateKey, remoteID d
} }
func newInitiatorHandshake(remoteID discover.NodeID) (*encHandshake, error) { 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 // generate random initiator nonce
n := make([]byte, shaLen) n := make([]byte, shaLen)
if _, err := rand.Read(n); err != nil { if _, err := rand.Read(n); err != nil {
@ -277,10 +281,6 @@ func newInitiatorHandshake(remoteID discover.NodeID) (*encHandshake, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
rpub, err := remoteID.Pubkey()
if err != nil {
return nil, fmt.Errorf("bad remoteID: %v", err)
}
h := &encHandshake{ h := &encHandshake{
initiator: true, initiator: true,
remoteID: remoteID, remoteID: remoteID,
@ -417,6 +417,14 @@ func decodeAuthMsg(prv *ecdsa.PrivateKey, token []byte, auth []byte) (*encHandsh
if err != nil { if err != nil {
return nil, err 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) h.remoteRandomPub, _ = importPublicKey(remoteRandomPub)
return h, nil return h, nil
} }