From b5647b2062e3233451532f44ce03c8b1bcdb7a3e Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 4 May 2014 03:38:58 +0200
Subject: wrapped-key-ring: no more pgp imports in PassphraseDialogFragment

---
 .../java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java | 7 ++++---
 .../org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java     | 8 +++++---
 .../java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java
index d0b18d757..948227819 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedSecretKey.java
@@ -41,17 +41,18 @@ public class CachedSecretKey extends CachedPublicKey {
         return (CachedSecretKeyRing) mRing;
     }
 
-    public void unlock(String passphrase) throws PgpGeneralException {
+    public boolean unlock(String passphrase) throws PgpGeneralException {
         try {
             PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
                     Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(passphrase.toCharArray());
             mPrivateKey = mSecretKey.extractPrivateKey(keyDecryptor);
         } catch (PGPException e) {
-            throw new PgpGeneralException("error extracting key!", e);
+            return false;
         }
         if(mPrivateKey == null) {
-            throw new PgpGeneralException("error extracting key (bad passphrase?)");
+            throw new PgpGeneralException("error extracting key");
         }
+        return true;
     }
 
     public PGPSignatureGenerator getSignatureGenerator(int hashAlgo, boolean cleartext)
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
index 37dfee8b9..27e9e8ebd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -344,9 +344,11 @@ public class PgpDecryptVerify {
             currentProgress += 5;
             updateProgress(R.string.progress_extracting_key, currentProgress, 100);
             try {
-                secretEncryptionKey.unlock(mPassphrase);
-            } catch (PgpGeneralException e) {
-                throw new WrongPassphraseException();
+                if (!secretEncryptionKey.unlock(mPassphrase)) {
+                    throw new WrongPassphraseException();
+                }
+            } catch(PgpGeneralException e) {
+                throw new KeyExtractionException();
             }
             currentProgress += 5;
             updateProgress(R.string.progress_preparing_streams, currentProgress, 100);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 7251709e0..1dfbfaf3a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -338,8 +338,8 @@ public class PgpKeyOperation {
     }
 
     public UncachedKeyRing buildSecretKey(CachedSecretKeyRing wmKR,
-                                                                   CachedPublicKeyRing wpKR,
-                                                                   SaveKeyringParcel saveParcel)
+                                          CachedPublicKeyRing wpKR,
+                                          SaveKeyringParcel saveParcel)
             throws PgpGeneralMsgIdException, PGPException, SignatureException, IOException {
 
         PGPSecretKeyRing mKR = wmKR.getRing();
-- 
cgit v1.2.3