From 5e416d6ae523dbf192fc59e7b1012cc7c2baf31d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 23 Nov 2017 10:55:42 +0100
Subject: [PATCH] collect all potential keys before asking for passphrase

---
 .../pgp/PgpDecryptVerifyOperation.java        | 12 +++-
 .../service/input/RequiredInputParcel.java    | 68 ++++++++++++++-----
 2 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java
index f7f31f903..8057f82a8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java
@@ -80,6 +80,7 @@ import org.sufficientlysecure.keychain.provider.KeyWritableRepository;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
+import org.sufficientlysecure.keychain.service.input.RequiredInputParcel.RequireAnyDecryptPassphraseBuilder;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.CharsetVerifier;
 import org.sufficientlysecure.keychain.util.FileHelper;
@@ -583,6 +584,8 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp
 
         Iterator<?> it = enc.getEncryptedDataObjects();
 
+        RequireAnyDecryptPassphraseBuilder requirePassphraseBuilder = new RequireAnyDecryptPassphraseBuilder();
+
         // go through all objects and find one we can decrypt
         while (it.hasNext()) {
             Object obj = it.next();
@@ -662,9 +665,8 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp
                         // if passphrase was not cached, return here indicating that a passphrase is missing!
                         if (passphrase == null) {
                             log.add(LogType.MSG_DC_PENDING_PASSPHRASE, indent + 1);
-                            return result.with(new DecryptVerifyResult(log,
-                                    RequiredInputParcel.createRequiredDecryptPassphrase(masterKeyId, subKeyId),
-                                    cryptoInput));
+                            requirePassphraseBuilder.add(masterKeyId, subKeyId);
+                            continue;
                         }
                     }
 
@@ -738,6 +740,10 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp
             }
         }
 
+        if (!asymmetricPacketFound && !requirePassphraseBuilder.isEmpty()) {
+            return result.with(new DecryptVerifyResult(log, requirePassphraseBuilder.build(), cryptoInput));
+        }
+
         // More data, just acknowledge and ignore.
         while (it.hasNext()) {
             Object obj = it.next();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java
index 34c7352a9..99f4fa069 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java
@@ -29,19 +29,25 @@ public class RequiredInputParcel implements Parcelable {
     public final byte[][] mInputData;
     public final int[] mSignAlgos;
 
-    private Long mMasterKeyId;
-    private Long mSubKeyId;
+    private long[] mMasterKeyIds;
+    private long[] mSubKeyIds;
 
     public boolean mSkipCaching = false;
 
     private RequiredInputParcel(RequiredInputType type, byte[][] inputData,
-            int[] signAlgos, Date signatureTime, Long masterKeyId, Long subKeyId) {
+            int[] signAlgos, Date signatureTime, long[] masterKeyIds, long[] subKeyIds) {
         mType = type;
         mInputData = inputData;
         mSignAlgos = signAlgos;
         mSignatureTime = signatureTime;
-        mMasterKeyId = masterKeyId;
-        mSubKeyId = subKeyId;
+        mMasterKeyIds = masterKeyIds;
+        mSubKeyIds = subKeyIds;
+    }
+
+    private RequiredInputParcel(RequiredInputType type, byte[][] inputData,
+            int[] signAlgos, Date signatureTime, Long masterKeyId, Long subKeyId) {
+        this(type, inputData, signAlgos, signatureTime, masterKeyId != null ? new long[] { masterKeyId } : null,
+                subKeyId != null ? new long[] { subKeyId } : null);
     }
 
     public RequiredInputParcel(Parcel source) {
@@ -70,18 +76,18 @@ public class RequiredInputParcel implements Parcelable {
         }
 
         mSignatureTime = source.readInt() != 0 ? new Date(source.readLong()) : null;
-        mMasterKeyId = source.readInt() != 0 ? source.readLong() : null;
-        mSubKeyId = source.readInt() != 0 ? source.readLong() : null;
+        mMasterKeyIds = source.readInt() != 0 ? source.createLongArray() : null;
+        mSubKeyIds = source.readInt() != 0 ? source.createLongArray() : null;
         mSkipCaching = source.readInt() != 0;
 
     }
 
     public Long getMasterKeyId() {
-        return mMasterKeyId;
+        return mMasterKeyIds == null ? null : mMasterKeyIds[0];
     }
 
     public Long getSubKeyId() {
-        return mSubKeyId;
+        return mSubKeyIds == null ? null : mSubKeyIds[0];
     }
 
     public static RequiredInputParcel createRetryUploadOperation() {
@@ -117,7 +123,7 @@ public class RequiredInputParcel implements Parcelable {
 
     public static RequiredInputParcel createSecurityTokenReset() {
         return new RequiredInputParcel(RequiredInputType.SECURITY_TOKEN_RESET_CARD,
-                null, null, null, null, null);
+                null, null, null, (long[]) null, null);
     }
 
     public static RequiredInputParcel createRequiredAuthenticationPassphrase(
@@ -140,18 +146,18 @@ public class RequiredInputParcel implements Parcelable {
 
     public static RequiredInputParcel createRequiredSymmetricPassphrase() {
         return new RequiredInputParcel(RequiredInputType.PASSPHRASE_SYMMETRIC,
-                null, null, null, null, null);
+                null, null, null, (long[]) null, null);
     }
 
     public static RequiredInputParcel createRequiredBackupCode() {
         return new RequiredInputParcel(RequiredInputType.BACKUP_CODE,
-                null, null, null, null, null);
+                null, null, null, (long[]) null, null);
     }
 
     public static RequiredInputParcel createRequiredPassphrase(
             RequiredInputParcel req) {
         return new RequiredInputParcel(RequiredInputType.PASSPHRASE,
-                null, null, req.mSignatureTime, req.mMasterKeyId, req.mSubKeyId);
+                null, null, req.mSignatureTime, req.mMasterKeyIds, req.mSubKeyIds);
     }
 
     @Override
@@ -180,15 +186,15 @@ public class RequiredInputParcel implements Parcelable {
         } else {
             dest.writeInt(0);
         }
-        if (mMasterKeyId != null) {
+        if (mMasterKeyIds != null) {
             dest.writeInt(1);
-            dest.writeLong(mMasterKeyId);
+            dest.writeLongArray(mMasterKeyIds);
         } else {
             dest.writeInt(0);
         }
-        if (mSubKeyId != null) {
+        if (mSubKeyIds != null) {
             dest.writeInt(1);
-            dest.writeLong(mSubKeyId);
+            dest.writeLongArray(mSubKeyIds);
         } else {
             dest.writeInt(0);
         }
@@ -302,7 +308,7 @@ public class RequiredInputParcel implements Parcelable {
         }
 
         public void addAll(RequiredInputParcel input) {
-            if (!mMasterKeyId.equals(input.mMasterKeyId)) {
+            if (!mMasterKeyId.equals(input.mMasterKeyIds)) {
                 throw new AssertionError("Master keys must match, this is a programming error!");
             }
             if (input.mType != RequiredInputType.SECURITY_TOKEN_MOVE_KEY_TO_CARD) {
@@ -318,4 +324,30 @@ public class RequiredInputParcel implements Parcelable {
 
     }
 
+    public static class RequireAnyDecryptPassphraseBuilder {
+        private final ArrayList<Long> masterKeyIds = new ArrayList<>();
+        private final ArrayList<Long> subKeyIds = new ArrayList<>();
+
+        public RequiredInputParcel build() {
+            int numIds = masterKeyIds.size();
+            long[] masterKeyIdsArr = new long[numIds];
+            long[] subKeyIdsArr = new long[numIds];
+            for (int i = 0; i < numIds; i++) {
+                masterKeyIdsArr[i] = masterKeyIds.get(i);
+                subKeyIdsArr[i] = subKeyIds.get(i);
+            }
+
+            return new RequiredInputParcel(RequiredInputType.PASSPHRASE,
+                    null, null, null, masterKeyIdsArr, subKeyIdsArr);
+        }
+
+        public void add(long masterKeyId, long subKeyId) {
+            masterKeyIds.add(masterKeyId);
+            subKeyIds.add(subKeyId);
+        }
+
+        public boolean isEmpty() {
+            return masterKeyIds.isEmpty();
+        }
+    }
 }