diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-16 11:50:23 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-16 11:50:23 +0200 |
| commit | b9df34468b71f156045a4f1cdb7123e3808e3789 (patch) | |
| tree | b416a3718eabd03992ca1238ef7424dd74249bc8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java | |
| parent | f1b14d338c2e0ad5294d060fec2557ff6d5afeb1 (diff) | |
| parent | 935f88131e47c19df5bb8bb5dd13d20d391f0794 (diff) | |
| download | open-keychain-b9df34468b71f156045a4f1cdb7123e3808e3789.tar.gz open-keychain-b9df34468b71f156045a4f1cdb7123e3808e3789.tar.bz2 open-keychain-b9df34468b71f156045a4f1cdb7123e3808e3789.zip | |
Merge pull request #1835 from nmikhailov/check_security_token
Check security token
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, 1 insertions, 1 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 e15139a7f..94606bff9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java @@ -769,7 +769,7 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp && !decryptorFactory.hasCachedSessionData(encryptedDataAsymmetric)) { log.add(LogType.MSG_DC_PENDING_NFC, indent + 1); - return result.with(new DecryptVerifyResult(log, RequiredInputParcel.createNfcDecryptOperation( + return result.with(new DecryptVerifyResult(log, RequiredInputParcel.createSecurityTokenDecryptOperation( decryptionKey.getRing().getMasterKeyId(), decryptionKey.getKeyId(), encryptedDataAsymmetric.getSessionKey()[0] ), cryptoInput)); |