aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-04 15:13:38 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-04 15:13:38 +0200
commitba018d1f1ba1942188cab81952cae2b4b8fb33b7 (patch)
tree409b38dfec7d435a8d3a05ef775a6ecfa78580c3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
parentc30c36fb2ac5ab1711bca21f0ba14d9f3ef6e074 (diff)
downloadopen-keychain-ba018d1f1ba1942188cab81952cae2b4b8fb33b7.tar.gz
open-keychain-ba018d1f1ba1942188cab81952cae2b4b8fb33b7.tar.bz2
open-keychain-ba018d1f1ba1942188cab81952cae2b4b8fb33b7.zip
yubikey: check with correct subkey id for sign operation
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index 40e265253..416dbce7c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -571,7 +571,7 @@ public class PgpSignEncrypt {
new SignEncryptResult(SignEncryptResult.RESULT_PENDING_NFC, log);
// Note that the checked key here is the master key, not the signing key
// (although these are always the same on Yubikeys)
- result.setNfcData(mSignatureMasterKeyId, e.hashToSign, e.hashAlgo, e.creationTimestamp, mSignaturePassphrase);
+ result.setNfcData(mSignatureSubKeyId, e.hashToSign, e.hashAlgo, e.creationTimestamp, mSignaturePassphrase);
Log.d(Constants.TAG, "e.hashToSign"+ Hex.toHexString(e.hashToSign));
return result;
}