diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 19:16:36 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 19:16:36 +0200 |
| commit | 18844a20bba68f8a6bf89c2faaa698c403ff1c18 (patch) | |
| tree | b04fb92a44c6fa11b6b687e6b797168ac3ef471d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |
| parent | 1deb5dbfda73b0fa72c132c318d9fb7a46aafeee (diff) | |
| download | open-keychain-18844a20bba68f8a6bf89c2faaa698c403ff1c18.tar.gz open-keychain-18844a20bba68f8a6bf89c2faaa698c403ff1c18.tar.bz2 open-keychain-18844a20bba68f8a6bf89c2faaa698c403ff1c18.zip | |
make masterKeyId and subKeyId strictly required in CryptoInputParcel
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index aa1125800..ea5147eb5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -602,7 +602,8 @@ public class PgpDecryptVerify extends BaseOperation { } catch (NfcSyncPublicKeyDataDecryptorFactoryBuilder.NfcInteractionNeeded e) { log.add(LogType.MSG_DC_PENDING_NFC, indent + 1); return new DecryptVerifyResult(log, RequiredInputParcel.createNfcDecryptOperation( - e.encryptedSessionKey, secretEncryptionKey.getKeyId() + secretEncryptionKey.getRing().getMasterKeyId(), + secretEncryptionKey.getKeyId(), e.encryptedSessionKey )); } encryptedData = encryptedDataAsymmetric; |