aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-13 22:13:04 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-13 22:16:35 +0200
commite2675caf234756c92669c84e8f855c780f8c5aae (patch)
tree088fa20c66ff5a3e6d15395909009e54a8a66f35 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
parentdf21b258ae7797b42e13fb7418e08f5bd4f9df77 (diff)
downloadopen-keychain-e2675caf234756c92669c84e8f855c780f8c5aae.tar.gz
open-keychain-e2675caf234756c92669c84e8f855c780f8c5aae.tar.bz2
open-keychain-e2675caf234756c92669c84e8f855c780f8c5aae.zip
just skip foreign uid certifications during import for now
Related to #836, fix still pending
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java4
1 files changed, 4 insertions, 0 deletions
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);