status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2412 from fjl/p2p-eip8-enable 

p2p: enable EIP-8 handshake sending
This commit is contained in:
Péter Szilágyi 2016-04-04 13:10:48 +03:00
parent 52dc7cb452 659c0cb9e8
commit 3a2da31c3e
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
p2p/rlpx.go
View File

@ -31,7 +31,6 @@ import (
"io"
mrand "math/rand"
"net"
"os"
"sync"
"time"
@ -262,8 +261,6 @@ func (h *encHandshake) staticSharedSecret(prv *ecdsa.PrivateKey) ([]byte, error)
return ecies.ImportECDSA(prv).GenerateShared(h.remotePub, sskLen, sskLen)
}
var configSendEIP = os.Getenv("RLPX_EIP8") != ""
// initiatorEncHandshake negotiates a session token on conn.
// it should be called on the dialing side of the connection.
//
@ -274,12 +271,7 @@ func initiatorEncHandshake(conn io.ReadWriter, prv *ecdsa.PrivateKey, remoteID d
if err != nil {
return s, err
}
var authPacket []byte
if configSendEIP {
authPacket, err = sealEIP8(authMsg, h)
} else {
authPacket, err = authMsg.sealPlain(h)
}
authPacket, err := sealEIP8(authMsg, h)
if err != nil {
return s, err
}