From e2675caf234756c92669c84e8f855c780f8c5aae Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 13 Sep 2014 22:13:04 +0200
Subject: just skip foreign uid certifications during import for now

Related to #836, fix still pending
---
 .../java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index fdf8c1f38..8e6a0dfa5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -472,6 +472,10 @@ public class ProviderHelper {
                         // verify signatures from known private keys
                         if (trustedKeys.indexOfKey(certId) >= 0) {
                             CanonicalizedPublicKey trustedKey = trustedKeys.get(certId);
+                            if (cert.isRevocation()) {
+                                // skip for now
+                                continue;
+                            }
                             cert.init(trustedKey);
                             if (cert.verifySignature(masterKey, rawUserId)) {
                                 item.trustedCerts.add(cert);
-- 
cgit v1.2.3


From 85d0f5b6d5724adfbdef462f21d0b0b427f61bde Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 13 Sep 2014 22:27:22 +0200
Subject: add key id to trailing asym data log msg

---
 .../org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java    | 9 ++++++---
 OpenKeychain/src/main/res/values/strings.xml                     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

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 bfa504bfd..6e59a3b9b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -375,11 +375,14 @@ public class PgpDecryptVerify {
         while (it.hasNext()) {
             Object obj = it.next();
             if (obj instanceof PGPPublicKeyEncryptedData) {
-                log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_ASYM, 0);
+                PGPPublicKeyEncryptedData encData = (PGPPublicKeyEncryptedData) obj;
+                long subKeyId = encData.getKeyID();
+                log.add(LogLevel.DEBUG, LogType.MSG_DC_TRAIL_ASYM, indent,
+                        PgpKeyHelper.convertKeyIdToHex(subKeyId));
             } else if (obj instanceof PGPPBEEncryptedData) {
-                log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_SYM, 0);
+                log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_SYM, indent);
             } else {
-                log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_UNKNOWN, 0);
+                log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_UNKNOWN, indent);
             }
         }
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 9e9b47c7c..5b68d4cdc 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -798,7 +798,7 @@
     <string name="msg_dc">"Starting decrypt operation…"</string>
     <string name="msg_dc_sym_skip">"Symmetric data not allowed, skipping…"</string>
     <string name="msg_dc_sym">"Found block of symmetrically encrypted data"</string>
-    <string name="msg_dc_trail_asym">"Encountered trailing, asymmetrically encrypted data"</string>
+    <string name="msg_dc_trail_asym">"Encountered trailing, asymmetrically encrypted data for key %s"</string>
     <string name="msg_dc_trail_sym">"Encountered trailing, symmetrically encrypted data"</string>
     <string name="msg_dc_trail_unknown">"Encountered trailing data of unknown type"</string>
     <string name="msg_dc_unlocking">"Unlocking secret key"</string>
-- 
cgit v1.2.3