aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org
diff options
context:
space:
mode:
authorogasser <oliver.gasser@gmail.com>2013-09-17 23:01:28 +0200
committerogasser <oliver.gasser@gmail.com>2013-09-17 23:01:28 +0200
commitf6d525da821880f898e44b968e0594b3ad9ff0cd (patch)
tree3ce067be7efb97a8883882c9391a40b2fc465a75 /OpenPGP-Keychain/src/org
parent7f46c40eb894a7198f9a96bd999a2bd6f984eabc (diff)
downloadopen-keychain-f6d525da821880f898e44b968e0594b3ad9ff0cd.tar.gz
open-keychain-f6d525da821880f898e44b968e0594b3ad9ff0cd.tar.bz2
open-keychain-f6d525da821880f898e44b968e0594b3ad9ff0cd.zip
Don't use revoked keys
Check if keys are revoked when getting usable encryption keys. Only use keys which are not expired and not revoked.
Diffstat (limited to 'OpenPGP-Keychain/src/org')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
index be4f25bb0..e5cf91f39 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
@@ -137,7 +137,7 @@ public class PgpKeyHelper {
PGPPublicKey masterKey = null;
for (int i = 0; i < encryptKeys.size(); ++i) {
PGPPublicKey key = encryptKeys.get(i);
- if (!isExpired(key)) {
+ if (!isExpired(key) && !key.isRevoked()) {
if (key.isMasterKey()) {
masterKey = key;
} else {