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/PgpSignEncryptOperation.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/PgpSignEncryptOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java index 9073e81b9..89bdf1c89 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java @@ -497,6 +497,7 @@ public class PgpSignEncryptOperation extends BaseOperation { // this secret key diverts to a OpenPGP card, throw exception with hash that will be signed log.add(LogType.MSG_PSE_PENDING_NFC, indent); return new PgpSignEncryptResult(log, RequiredInputParcel.createNfcSignOperation( + signingKey.getRing().getMasterKeyId(), signingKey.getKeyId(), e.hashToSign, e.hashAlgo, cryptoInput.getSignatureTime())); } } |