aboutsummaryrefslogtreecommitdiffstats
path: root/whisper
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-02 20:00:25 +0800
committerobscuren <geffobscura@gmail.com>2015-01-02 20:00:25 +0800
commite2d1d832efe0623539c9d37ca8aee17d44e47067 (patch)
treeae681ba7255a293bf3edc02c30da207bae9ac96a /whisper
parentd336e24dcec2bb2cb89fff76302882aa82124dc8 (diff)
downloaddexon-e2d1d832efe0623539c9d37ca8aee17d44e47067.tar
dexon-e2d1d832efe0623539c9d37ca8aee17d44e47067.tar.gz
dexon-e2d1d832efe0623539c9d37ca8aee17d44e47067.tar.bz2
dexon-e2d1d832efe0623539c9d37ca8aee17d44e47067.tar.lz
dexon-e2d1d832efe0623539c9d37ca8aee17d44e47067.tar.xz
dexon-e2d1d832efe0623539c9d37ca8aee17d44e47067.tar.zst
dexon-e2d1d832efe0623539c9d37ca8aee17d44e47067.zip
added nil check
Diffstat (limited to 'whisper')
-rw-r--r--whisper/envelope.go1
-rw-r--r--whisper/messages_test.go5
2 files changed, 3 insertions, 3 deletions
diff --git a/whisper/envelope.go b/whisper/envelope.go
index 066e20f6a..9d28dfa6b 100644
--- a/whisper/envelope.go
+++ b/whisper/envelope.go
@@ -79,6 +79,7 @@ func (self *Envelope) Open(prv *ecdsa.PrivateKey) (msg *Message, err error) {
if prv != nil {
message.Payload, err = crypto.Decrypt(prv, payload)
switch err {
+ case nil: // OK
case ecies.ErrInvalidPublicKey: // Payload isn't encrypted
message.Payload = payload
return &message, err
diff --git a/whisper/messages_test.go b/whisper/messages_test.go
index cba103011..93caa31b3 100644
--- a/whisper/messages_test.go
+++ b/whisper/messages_test.go
@@ -40,12 +40,11 @@ func TestMessageEncryptDecrypt(t *testing.T) {
msg1, err := envelope.Open(prv2)
if err != nil {
- fmt.Println(err)
+ t.Error(err)
t.FailNow()
}
if !bytes.Equal(msg1.Payload, data) {
- fmt.Println("encryption error. data did not match")
- t.FailNow()
+ t.Error("encryption error. data did not match")
}
}