moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-19 20:31:52 -05:00
Code Issues Releases Wiki Activity

Fix test

Browse Source
This commit is contained in:
Dominik Schürmann 2014-07-21 15:25:09 +02:00
parent 2f5c73746d
commit afd6851e5b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@ -177,8 +177,7 @@ public class UncachedKeyRing {
((PGPSecretKeyRing) mRing).getSecretKeys())) { ((PGPSecretKeyRing) mRing).getSecretKeys())) {
S2K s2k = sub.getS2K(); S2K s2k = sub.getS2K();
// add key, except if the private key has been stripped (GNU extension) // add key, except if the private key has been stripped (GNU extension)
if(s2k == null || (s2k.getType() == S2K.GNU_DUMMY_S2K if(s2k == null || (s2k.getProtectionMode() != S2K.GNU_PROTECTION_MODE_NO_PRIVATE_KEY)) {
&& s2k.getProtectionMode() != S2K.GNU_PROTECTION_MODE_NO_PRIVATE_KEY)) {
result.add(sub.getKeyID()); result.add(sub.getKeyID());
} else { } else {
Log.d(Constants.TAG, "S2K GNU extension!, mode: " + s2k.getProtectionMode()); Log.d(Constants.TAG, "S2K GNU extension!, mode: " + s2k.getProtectionMode());