mirror of
https://github.com/status-im/whisper.git
synced 2025-02-23 07:58:14 +00:00
all: Rename crypto.Sha3{,Hash}() to crypto.Keccak256{,Hash}()
As we aren't really using the standarized SHA-3
This commit is contained in:
parent
89f151f85c
commit
66d2e874ba
@ -66,7 +66,7 @@ func (self *Envelope) Seal(pow time.Duration) {
|
||||
for i := 0; i < 1024; i++ {
|
||||
binary.BigEndian.PutUint32(d[60:], nonce)
|
||||
|
||||
firstBit := common.FirstBitSet(common.BigD(crypto.Sha3(d)))
|
||||
firstBit := common.FirstBitSet(common.BigD(crypto.Keccak256(d)))
|
||||
if firstBit > bestBit {
|
||||
self.Nonce, bestBit = nonce, firstBit
|
||||
}
|
||||
@ -123,7 +123,7 @@ func (self *Envelope) Open(key *ecdsa.PrivateKey) (msg *Message, err error) {
|
||||
func (self *Envelope) Hash() common.Hash {
|
||||
if (self.hash == common.Hash{}) {
|
||||
enc, _ := rlp.EncodeToBytes(self)
|
||||
self.hash = crypto.Sha3Hash(enc)
|
||||
self.hash = crypto.Keccak256Hash(enc)
|
||||
}
|
||||
return self.hash
|
||||
}
|
||||
@ -142,6 +142,6 @@ func (self *Envelope) DecodeRLP(s *rlp.Stream) error {
|
||||
if err := rlp.DecodeBytes(raw, (*rlpenv)(self)); err != nil {
|
||||
return err
|
||||
}
|
||||
self.hash = crypto.Sha3Hash(raw)
|
||||
self.hash = crypto.Keccak256Hash(raw)
|
||||
return nil
|
||||
}
|
||||
|
@ -146,7 +146,7 @@ func (self *Message) decrypt(key *ecdsa.PrivateKey) error {
|
||||
|
||||
// hash calculates the SHA3 checksum of the message flags and payload.
|
||||
func (self *Message) hash() []byte {
|
||||
return crypto.Sha3(append([]byte{self.Flags}, self.Payload...))
|
||||
return crypto.Keccak256(append([]byte{self.Flags}, self.Payload...))
|
||||
}
|
||||
|
||||
// bytes flattens the message contents (flags, signature and payload) into a
|
||||
|
2
topic.go
2
topic.go
@ -31,7 +31,7 @@ type Topic [4]byte
|
||||
// Note, empty topics are considered the wildcard, and cannot be used in messages.
|
||||
func NewTopic(data []byte) Topic {
|
||||
prefix := [4]byte{}
|
||||
copy(prefix[:], crypto.Sha3(data)[:4])
|
||||
copy(prefix[:], crypto.Keccak256(data)[:4])
|
||||
return Topic(prefix)
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user