From ce40930f0becca681253e8f7508e5e1f4d37a233 Mon Sep 17 00:00:00 2001
From: Vlad <gluk256@gmail.com>
Date: Wed, 30 Nov 2016 16:55:11 +0100
Subject: [PATCH] whisper: got rid of redundant stuff

---
 whisper/whisperv5/envelope.go |  2 +-
 whisper/whisperv5/peer.go     |  3 +++
 whisper/whisperv5/whisper.go  | 10 ----------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go
index 6835e22c03..3d048bb445 100644
--- a/whisper/whisperv5/envelope.go
+++ b/whisper/whisperv5/envelope.go
@@ -73,7 +73,7 @@ func NewEnvelope(ttl uint32, topic TopicType, salt []byte, aesNonce []byte, msg
 }
 
 func (e *Envelope) IsSymmetric() bool {
-	return e.AESNonce != nil
+	return len(e.AESNonce) > 0
 }
 
 func (e *Envelope) isAsymmetric() bool {
diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go
index fc1afb6d6a..4273cfce1f 100644
--- a/whisper/whisperv5/peer.go
+++ b/whisper/whisperv5/peer.go
@@ -165,6 +165,9 @@ func (p *Peer) broadcast() error {
 			p.mark(envelope)
 		}
 	}
+	if len(transmit) == 0 {
+		return nil
+	}
 	// Transmit the unknown batch (potentially empty)
 	if err := p2p.Send(p.ws, messagesCode, transmit); err != nil {
 		return err
diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go
index 8a9770fdd0..6e3266bb63 100644
--- a/whisper/whisperv5/whisper.go
+++ b/whisper/whisperv5/whisper.go
@@ -183,7 +183,6 @@ func (w *Whisper) GetIdentity(pubKey string) *ecdsa.PrivateKey {
 func (w *Whisper) GenerateSymKey(name string) error {
 	const size = aesKeyLength * 2
 	buf := make([]byte, size)
-	buf2 := make([]byte, size)
 	_, err := crand.Read(buf)
 	if err != nil {
 		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")
 	}
 
-	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]
 	salt := buf[aesKeyLength:]
 	derived, err := DeriveOneTimeKey(key, salt, EnvelopeVersion)