diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-02 12:33:56 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-02 12:33:56 +0200 |
| commit | a125b51b1cf059eb8790770cb7c64cf7207373d3 (patch) | |
| tree | b1befc2935aa355bd017aa17b6b9a59142f248db | |
| parent | 675d2bd6dde411a56208185283cdd03bab543fb3 (diff) | |
| download | open-keychain-a125b51b1cf059eb8790770cb7c64cf7207373d3.tar.gz open-keychain-a125b51b1cf059eb8790770cb7c64cf7207373d3.tar.bz2 open-keychain-a125b51b1cf059eb8790770cb7c64cf7207373d3.zip | |
Fix nullpointer with getS2K()
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java index 697808d2f..bec07ce21 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java @@ -145,7 +145,8 @@ public class CanonicalizedSecretKey extends CanonicalizedPublicKey { */ public boolean unlock(String passphrase) throws PgpGeneralException { // handle keys on OpenPGP cards like they were unlocked - if (mSecretKey.getS2K().getType() == S2K.GNU_DUMMY_S2K + if (mSecretKey.getS2K() != null + && mSecretKey.getS2K().getType() == S2K.GNU_DUMMY_S2K && mSecretKey.getS2K().getProtectionMode() == S2K.GNU_PROTECTION_MODE_DIVERT_TO_CARD) { mPrivateKeyState = PRIVATE_KEY_STATE_DIVERT_TO_CARD; return true; |