Merge branch 'master' of github.com:open-keychain/open-keychain

2 files changed, 10 insertions, 3 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/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);