diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-10 02:02:27 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-13 23:34:06 +0530 |
commit | faa66d6140e7f68d920e612c21fa01139b12170e (patch) | |
tree | da213696336d0051a83e3e111576551ede613e0f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations | |
parent | d1409fd5c89bc10dd0c39a228049e4c2f669c65a (diff) | |
download | open-keychain-faa66d6140e7f68d920e612c21fa01139b12170e.tar.gz open-keychain-faa66d6140e7f68d920e612c21fa01139b12170e.tar.bz2 open-keychain-faa66d6140e7f68d920e612c21fa01139b12170e.zip |
prevented passphrase caching on revocation
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java index f8f7e79a3..6a1c01dd1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java @@ -161,7 +161,7 @@ public class EditKeyOperation extends BaseOperation<SaveKeyringParcel> { } // There is a new passphrase - cache it - if (saveParcel.mNewUnlock != null) { + if (saveParcel.mNewUnlock != null && cryptoInput.mCachePassphrase) { log.add(LogType.MSG_ED_CACHING_NEW, 1); // NOTE: Don't cache empty passphrases! Important for MOVE_KEY_TO_CARD diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java index 157e36e04..0fc3f1bc3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/RevokeOperation.java @@ -32,6 +32,9 @@ public class RevokeOperation extends BaseOperation<RevokeKeyringParcel> { public OperationResult execute(RevokeKeyringParcel revokeKeyringParcel, CryptoInputParcel cryptoInputParcel) { + // we don't cache passphrases during revocation + cryptoInputParcel.mCachePassphrase = false; + long masterKeyId = revokeKeyringParcel.mMasterKeyId; OperationResult.OperationLog log = new OperationResult.OperationLog(); |