Merge pull request #2119 from ccellado/better-wallet-unlock-error

Better wallet unlock error
ergoplatform · Feb 25, 2024 · c19b7dd · c19b7dd
2 parents 1d251d5 + aa8cf53
commit c19b7dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ergo-wallet/src/main/scala/org/ergoplatform/wallet/crypto/AES.scala b/ergo-wallet/src/main/scala/org/ergoplatform/wallet/crypto/AES.scala
@@ -3,8 +3,8 @@ package org.ergoplatform.wallet.crypto
 import org.ergoplatform.sdk.wallet.settings.EncryptionSettings
 
 import javax.crypto.spec.{GCMParameterSpec, PBEKeySpec, SecretKeySpec}
-import javax.crypto.{Cipher, SecretKeyFactory}
-import scala.util.Try
+import javax.crypto.{AEADBadTagException, Cipher, SecretKeyFactory}
+import scala.util.{Failure, Try}
 
 object AES {
 
@@ -51,7 +51,10 @@ object AES {
     val cipher = Cipher.getInstance(CipherAlgoInstance)
     cipher.init(Cipher.DECRYPT_MODE, keySpec, paramsSpec)
 
-    Try(cipher.doFinal(authTag ++ ciphertext))
+    Try(cipher.doFinal(authTag ++ ciphertext)).recoverWith ({
+      case _: AEADBadTagException  => Failure(new Throwable("Bad wallet password"))
+      case e: Throwable            => Failure(e)
+    })
   }
 
   private def deriveEncryptionKeySpec(pass: Array[Char], salt: Array[Byte])

diff --git a/ergo-wallet/src/main/scala/org/ergoplatform/wallet/secrets/JsonSecretStorage.scala b/ergo-wallet/src/main/scala/org/ergoplatform/wallet/secrets/JsonSecretStorage.scala
@@ -73,7 +73,7 @@ final class JsonSecretStorage(val secretFile: File, encryptionSettings: Encrypti
             }
           }
       }
-      . fold(Failure(_), Success(_))
+      .fold(Failure(_), Success(_))
       .flatten
   }