From f6d525da821880f898e44b968e0594b3ad9ff0cd Mon Sep 17 00:00:00 2001
From: ogasser <oliver.gasser@gmail.com>
Date: Tue, 17 Sep 2013 23:01:28 +0200
Subject: 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.
---
 .../src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenPGP-Keychain/src')

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 {
-- 
cgit v1.2.3