From 80688313eddf2111fbdbd2b897bc2159d699a6d1 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 18 Apr 2020 18:20:46 -0400 Subject: better error messages for incorrect passwords --- src/actions.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/actions.rs') diff --git a/src/actions.rs b/src/actions.rs index 0fea7df..4dbe4ca 100644 --- a/src/actions.rs +++ b/src/actions.rs @@ -38,9 +38,12 @@ pub async fn unlock( let protected_key = crate::cipherstring::CipherString::new(protected_key)?; - let master_keys = protected_key.decrypt_locked(&identity.keys)?; - Ok(crate::locked::Keys::new(master_keys)) + match protected_key.decrypt_locked(&identity.keys) { + Ok(master_keys) => Ok(crate::locked::Keys::new(master_keys)), + Err(Error::InvalidMac) => Err(Error::IncorrectPassword), + Err(e) => Err(e), + } } pub async fn sync( -- cgit v1.2.3-54-g00ecf