diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-21 15:25:09 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-21 15:25:09 +0200 |
| commit | afd6851e5b8b8dd0f1c50144fe36dbcf9ae8f5cd (patch) | |
| tree | c2c872a7700af1425a46d8038795e811634c7e69 /OpenKeychain/src | |
| parent | 2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a (diff) | |
| download | open-keychain-afd6851e5b8b8dd0f1c50144fe36dbcf9ae8f5cd.tar.gz open-keychain-afd6851e5b8b8dd0f1c50144fe36dbcf9ae8f5cd.tar.bz2 open-keychain-afd6851e5b8b8dd0f1c50144fe36dbcf9ae8f5cd.zip | |
Fix test
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 3 |
1 files changed, 1 insertions, 2 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 5dc3c598e..308375a1d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -177,8 +177,7 @@ public class UncachedKeyRing { ((PGPSecretKeyRing) mRing).getSecretKeys())) { S2K s2k = sub.getS2K(); // add key, except if the private key has been stripped (GNU extension) - if(s2k == null || (s2k.getType() == S2K.GNU_DUMMY_S2K - && s2k.getProtectionMode() != S2K.GNU_PROTECTION_MODE_NO_PRIVATE_KEY)) { + if(s2k == null || (s2k.getProtectionMode() != S2K.GNU_PROTECTION_MODE_NO_PRIVATE_KEY)) { result.add(sub.getKeyID()); } else { Log.d(Constants.TAG, "S2K GNU extension!, mode: " + s2k.getProtectionMode()); |