From 4e5b29eb4a9e34d39ecc6735b92fef6543ed5c07 Mon Sep 17 00:00:00 2001 From: Aron Wussler Date: Wed, 29 Apr 2020 17:23:16 +0200 Subject: [PATCH] Fix symmetric session key test --- crypto/password.go | 2 +- crypto/sessionkey_test.go | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/crypto/password.go b/crypto/password.go index f85fba2..91f2dd6 100644 --- a/crypto/password.go +++ b/crypto/password.go @@ -70,7 +70,7 @@ func DecryptSessionKeyWithPassword(keyPacket, password []byte) (*SessionKey, err } } - return nil, errors.New("gopenpgp: password incorrect") + return nil, errors.New("gopenpgp: unable to decrypt any packet") } // EncryptSessionKeyWithPassword encrypts the session key with the password and diff --git a/crypto/sessionkey_test.go b/crypto/sessionkey_test.go index 2f0b015..e496810 100644 --- a/crypto/sessionkey_test.go +++ b/crypto/sessionkey_test.go @@ -52,14 +52,17 @@ func TestSymmetricKeyPacket(t *testing.T) { t.Fatal("Expected no error while generating key packet, got:", err) } - _, err = DecryptSessionKeyWithPassword(keyPacket, []byte("Wrong password")) - assert.EqualError(t, err, "gopenpgp: password incorrect") + wrongSymmetricKey, err := DecryptSessionKeyWithPassword(keyPacket, []byte("Wrong password")) + if err != nil { + assert.EqualError(t, err, "gopenpgp: unable to decrypt any packet") + } else { + assert.NotEqual(t, testSessionKey, wrongSymmetricKey) + } outputSymmetricKey, err := DecryptSessionKeyWithPassword(keyPacket, password) if err != nil { t.Fatal("Expected no error while decrypting key packet, got:", err) } - assert.Exactly(t, testSessionKey, outputSymmetricKey) }