diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-01 15:21:33 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-05 16:10:47 +0100 |
| commit | e3b8cea04d43d9aafec544f56aa46ccf691a575d (patch) | |
| tree | 5963ecb99710fc2409298948bd83aa2cd50d8806 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java | |
| parent | cbf6f15d91f53f460584d959fcd16440c9309be1 (diff) | |
| download | open-keychain-e3b8cea04d43d9aafec544f56aa46ccf691a575d.tar.gz open-keychain-e3b8cea04d43d9aafec544f56aa46ccf691a575d.tar.bz2 open-keychain-e3b8cea04d43d9aafec544f56aa46ccf691a575d.zip | |
performance: cache session keys per compatible S2K configuration
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java index ea7465209..79a7a8fe1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java @@ -610,6 +610,8 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp if (secretEncryptionKey.getSecretKeyType() == SecretKeyType.DIVERT_TO_CARD) { passphrase = null; + } else if (secretKeyType == SecretKeyType.PASSPHRASE_EMPTY) { + passphrase = new Passphrase(""); } else if (cryptoInput.hasPassphrase()) { passphrase = cryptoInput.getPassphrase(); } else { |