aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-11-21 23:55:17 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-11-21 23:55:17 +0100
commit47caad3edbdb32dd47bdbee27828edda81e433e1 (patch)
treedd76b19147dbf0f1926555b1d949f4646b570fc3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
parent629d83a1ceedefe42f6e763af2065033f3fe77ae (diff)
parenta805069c59586775fd5790c00cbd82f4dfeddcb6 (diff)
downloadopen-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.tar.gz
open-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.tar.bz2
open-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.zip
Merge branch 'development' into keybase-proofs
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java2
1 files changed, 1 insertions, 1 deletions
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 8856da8b0..d05ce3d5c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -330,7 +330,7 @@ public class UncachedKeyRing {
}
if (cert.isLocal()) {
- // Creation date in the future? No way!
+ // Remove revocation certs with "local" flag
log.add(LogType.MSG_KC_REVOKE_BAD_LOCAL, indent);
modified = PGPPublicKey.removeCertification(modified, zert);
badCerts += 1;