diff options
| author | Felix Lange <fjl@twurst.com> | 2017-01-06 23:44:20 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-01-07 01:18:07 +0800 |
| commit | f2da6581ba827a2aab091f764ace8017b26450d8 (patch) | |
| tree | 3bf7ed2ec48812064c5eb6191c9848ad7985561b /crypto | |
| parent | 35a7dcb162546f7f31cb6492f716cb93159218d7 (diff) | |
| download | go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.gz go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.bz2 go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.lz go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.xz go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.zst go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.zip | |
all: fix issues reported by honnef.co/go/simple/cmd/gosimple
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto_test.go | 2 | ||||
| -rw-r--r-- | crypto/ecies/ecies.go | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 86a582306..f42605d32 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -217,7 +217,7 @@ func TestValidateSignatureValues(t *testing.T) { func checkhash(t *testing.T, name string, f func([]byte) []byte, msg, exp []byte) { sum := f(msg) - if bytes.Compare(exp, sum) != 0 { + if !bytes.Equal(exp, sum) { t.Fatalf("hash %s mismatch: want: %x have: %x", name, exp, sum) } } diff --git a/crypto/ecies/ecies.go b/crypto/ecies/ecies.go index 86a70261d..b1a716c00 100644 --- a/crypto/ecies/ecies.go +++ b/crypto/ecies/ecies.go @@ -291,9 +291,8 @@ func Encrypt(rand io.Reader, pub *PublicKey, m, s1, s2 []byte) (ct []byte, err e // Decrypt decrypts an ECIES ciphertext. func (prv *PrivateKey) Decrypt(rand io.Reader, c, s1, s2 []byte) (m []byte, err error) { - if c == nil || len(c) == 0 { - err = ErrInvalidMessage - return + if len(c) == 0 { + return nil, ErrInvalidMessage } params := prv.PublicKey.Params if params == nil { |