From 51bb96742f95b5b3b1ce68aef76fb5b0ddc5575d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 4 May 2015 14:01:34 +0200
Subject: Apply patch from
 https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938

---
 .../keychain/pgp/PgpSignEncryptOperation.java                 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
index 8ecb30cdd..9073e81b9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
@@ -178,13 +178,20 @@ public class PgpSignEncryptOperation extends BaseOperation {
                     case PIN:
                     case PATTERN:
                     case PASSPHRASE: {
-                        if (cryptoInput.getPassphrase() == null) {
+                        Passphrase localPassphrase = cryptoInput.getPassphrase();
+                        if (localPassphrase == null) {
+                            try {
+                                localPassphrase = getCachedPassphrase(signingKeyRing.getMasterKeyId(), signingKey.getKeyId());
+                            } catch (PassphraseCacheInterface.NoSecretKeyException ignored) {
+                            }
+                        }
+                        if (localPassphrase == null) {
                             log.add(LogType.MSG_PSE_PENDING_PASSPHRASE, indent + 1);
                             return new PgpSignEncryptResult(log, RequiredInputParcel.createRequiredSignPassphrase(
                                     signingKeyRing.getMasterKeyId(), signingKey.getKeyId(),
                                     cryptoInput.getSignatureTime()));
                         }
-                        if (!signingKey.unlock(cryptoInput.getPassphrase())) {
+                        if (!signingKey.unlock(localPassphrase)) {
                             log.add(LogType.MSG_PSE_ERROR_BAD_PASSPHRASE, indent);
                             return new PgpSignEncryptResult(PgpSignEncryptResult.RESULT_ERROR, log);
                         }
-- 
cgit v1.2.3


From b726dea244f020660d5260d3211d6500655fe680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 4 May 2015 14:12:42 +0200
Subject: license header for PgpCertifyOperation

---
 .../keychain/pgp/PgpCertifyOperation.java            | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpCertifyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpCertifyOperation.java
index 90ec3053f..bf2349734 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpCertifyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpCertifyOperation.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2015 Vincent Breitmoser <v.breitmoser@mugenguild.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.sufficientlysecure.keychain.pgp;
 
 
@@ -32,7 +50,7 @@ public class PgpCertifyOperation {
             OperationLog log,
             int indent,
             CertifyAction action,
-            Map<ByteBuffer,byte[]> signedHashes,
+            Map<ByteBuffer, byte[]> signedHashes,
             Date creationTimestamp) {
 
         if (!secretKey.isMasterKey()) {
-- 
cgit v1.2.3


From 91d500b20dba3d83085e4cca8836a4eaff24f113 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 6 May 2015 11:25:29 +0200
Subject: check for fingerprint of any subkey (arguable?)

---
 .../org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index b86618a9a..2bb4f7dc4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -215,6 +215,17 @@ public class UncachedKeyRing {
 
     }
 
+    public boolean containsSubkey(String expectedFingerprint) {
+        Iterator<PGPPublicKey> it = mRing.getPublicKeys();
+        while (it.hasNext()) {
+            if (KeyFormattingUtils.convertFingerprintToHex(
+                    it.next().getFingerprint()).equals(expectedFingerprint)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public interface IteratorWithIOThrow<E> {
         public boolean hasNext() throws IOException;
         public E next() throws IOException;
-- 
cgit v1.2.3