forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

whisper: got rid of redundant stuff

Browse source
This commit is contained in:
Vlad 2016-11-30 16:55:11 +01:00
parent 2b549db080
commit ce40930f0b
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
whisper/whisperv5/envelope.go
View file

@ -73,7 +73,7 @@ func NewEnvelope(ttl uint32, topic TopicType, salt []byte, aesNonce []byte, msg
} }
func (e *Envelope) IsSymmetric() bool { func (e *Envelope) IsSymmetric() bool {
return e.AESNonce != nil return len(e.AESNonce) > 0
} }
func (e *Envelope) isAsymmetric() bool { func (e *Envelope) isAsymmetric() bool {

3
whisper/whisperv5/peer.go
View file

@ -165,6 +165,9 @@ func (p *Peer) broadcast() error {
p.mark(envelope) p.mark(envelope)
} }
} }
if len(transmit) == 0 {
return nil
}
// Transmit the unknown batch (potentially empty) // Transmit the unknown batch (potentially empty)
if err := p2p.Send(p.ws, messagesCode, transmit); err != nil { if err := p2p.Send(p.ws, messagesCode, transmit); err != nil {
return err return err

10
whisper/whisperv5/whisper.go
View file

@ -183,7 +183,6 @@ func (w *Whisper) GetIdentity(pubKey string) *ecdsa.PrivateKey {
func (w *Whisper) GenerateSymKey(name string) error { func (w *Whisper) GenerateSymKey(name string) error {
const size = aesKeyLength * 2 const size = aesKeyLength * 2
buf := make([]byte, size) buf := make([]byte, size)
buf2 := make([]byte, size)
_, err := crand.Read(buf) _, err := crand.Read(buf)
if err != nil { if err != nil {
return err return err
@ -191,15 +190,6 @@ func (w *Whisper) GenerateSymKey(name string) error {
return fmt.Errorf("error in GenerateSymKey: crypto/rand failed to generate random data") return fmt.Errorf("error in GenerateSymKey: crypto/rand failed to generate random data")
} }
randomize(buf2)
if !validateSymmetricKey(buf2) {
return fmt.Errorf("error in GenerateSymKey: math/rand failed to generate random data")
}
for i := 0; i < size; i++ {
buf[i] ^= buf2[i]
}
key := buf[:aesKeyLength] key := buf[:aesKeyLength]
salt := buf[aesKeyLength:] salt := buf[aesKeyLength:]
derived, err := DeriveOneTimeKey(key, salt, EnvelopeVersion) derived, err := DeriveOneTimeKey(key, salt, EnvelopeVersion)