diff options
| author | Ricardo Catalinas Jiménez <r@untroubled.be> | 2016-02-22 02:40:27 +0800 |
|---|---|---|
| committer | Ricardo Catalinas Jiménez <r@untroubled.be> | 2016-02-22 06:34:34 +0800 |
| commit | 436fc8d76a4871d67a61dc86c1a635e20594a0e6 (patch) | |
| tree | 5fad9f69b068f43ca606e2887f5522188e7f9ddd /p2p/rlpx.go | |
| parent | c20d6e5e4ed8eff6d26cd849f90ca42dd5a7040c (diff) | |
| download | go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.gz go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.bz2 go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.lz go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.xz go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.zst go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.zip | |
all: Rename crypto.Sha3{,Hash}() to crypto.Keccak256{,Hash}()
As we aren't really using the standarized SHA-3
Diffstat (limited to 'p2p/rlpx.go')
| -rw-r--r-- | p2p/rlpx.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 9d6cba5b6..ddfafe9a4 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -232,12 +232,12 @@ func (h *encHandshake) secrets(auth, authResp []byte) (secrets, error) { } // derive base secrets from ephemeral key agreement - sharedSecret := crypto.Sha3(ecdheSecret, crypto.Sha3(h.respNonce, h.initNonce)) - aesSecret := crypto.Sha3(ecdheSecret, sharedSecret) + sharedSecret := crypto.Keccak256(ecdheSecret, crypto.Keccak256(h.respNonce, h.initNonce)) + aesSecret := crypto.Keccak256(ecdheSecret, sharedSecret) s := secrets{ RemoteID: h.remoteID, AES: aesSecret, - MAC: crypto.Sha3(ecdheSecret, aesSecret), + MAC: crypto.Keccak256(ecdheSecret, aesSecret), } // setup sha3 instances for the MACs @@ -426,7 +426,7 @@ func (h *encHandshake) makeAuthResp() (msg *authRespV4, err error) { func (msg *authMsgV4) sealPlain(h *encHandshake) ([]byte, error) { buf := make([]byte, authMsgLen) n := copy(buf, msg.Signature[:]) - n += copy(buf[n:], crypto.Sha3(exportPubkey(&h.randomPrivKey.PublicKey))) + n += copy(buf[n:], crypto.Keccak256(exportPubkey(&h.randomPrivKey.PublicKey))) n += copy(buf[n:], msg.InitiatorPubkey[:]) n += copy(buf[n:], msg.Nonce[:]) buf[n] = 0 // token-flag |