diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-13 22:55:32 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-13 22:55:32 +0200 |
| commit | efdfd2544dc9be5b3dbfba0a2e91fe0e841c7e43 (patch) | |
| tree | 3e712b25d1388431500918707ba91f6cd4d84522 | |
| parent | c9fee47fb3794f2a2d5bbb116e9dccddc42c8cfd (diff) | |
| parent | 85d0f5b6d5724adfbdef462f21d0b0b427f61bde (diff) | |
| download | open-keychain-efdfd2544dc9be5b3dbfba0a2e91fe0e841c7e43.tar.gz open-keychain-efdfd2544dc9be5b3dbfba0a2e91fe0e841c7e43.tar.bz2 open-keychain-efdfd2544dc9be5b3dbfba0a2e91fe0e841c7e43.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
3 files changed, 11 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/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); diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index afaf4740c..62299ed34 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> |