Merge pull request #3 from berty/chore/cherry-pick-PR-1289

chore: Cherry pick PR 1289 for error handling
berty · Oct 24, 2023 · c0cef2f · c0cef2f
2 parents a3bdd2b + edea16a
commit c0cef2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/tm2/pkg/crypto/keys/armor/armor.go b/tm2/pkg/crypto/keys/armor/armor.go
@@ -128,7 +128,7 @@ func decryptPrivKey(saltBytes []byte, encBytes []byte, passphrase string) (privK
 	}
 	key = crypto.Sha256(key) // Get 32 bytes
 	privKeyBytes, err := xsalsa20symmetric.DecryptSymmetric(encBytes, key)
-	if err != nil && err.Error() == "Ciphertext decryption failed" {
+	if err != nil && err.Error() == "ciphertext decryption failed" {
 		return privKey, keyerror.NewErrWrongPassword()
 	} else if err != nil {
 		return privKey, err

diff --git a/tm2/pkg/crypto/keys/keyerror/errors.go b/tm2/pkg/crypto/keys/keyerror/errors.go
@@ -1,6 +1,7 @@
 package keyerror
 
 import (
+	"errors"
 	"fmt"
 )
 
@@ -40,7 +41,8 @@ func IsErrKeyNotFound(err error) bool {
 	if err == nil {
 		return false
 	}
-	if keyErr, ok := err.(keybaseError); ok {
+	var keyErr keybaseError
+	if errors.As(err, &keyErr) {
 		if keyErr.Code() == codeKeyNotFound {
 			return true
 		}
@@ -72,7 +74,8 @@ func IsErrWrongPassword(err error) bool {
 	if err == nil {
 		return false
 	}
-	if keyErr, ok := err.(keybaseError); ok {
+	var keyErr keybaseError
+	if errors.As(err, &keyErr) {
 		if keyErr.Code() == codeWrongPassword {
 			return true
 		}