diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-17 14:11:06 -0700 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-17 14:11:06 -0700 |
| commit | 4c461c1b445eb339382b5ffd174e6d19b93f25d0 (patch) | |
| tree | 3ce067be7efb97a8883882c9391a40b2fc465a75 | |
| parent | 7f46c40eb894a7198f9a96bd999a2bd6f984eabc (diff) | |
| parent | f6d525da821880f898e44b968e0594b3ad9ff0cd (diff) | |
| download | open-keychain-4c461c1b445eb339382b5ffd174e6d19b93f25d0.tar.gz open-keychain-4c461c1b445eb339382b5ffd174e6d19b93f25d0.tar.bz2 open-keychain-4c461c1b445eb339382b5ffd174e6d19b93f25d0.zip | |
Merge pull request #131 from ogasser/patch-1
Don't use revoked keys
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java | 2 |
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 { |