aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-24 00:50:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-24 00:50:58 +0200
commit07704c2726e66b3834834d76c4046b144348b58e (patch)
tree84f14eca434adf4c21aad9af7bc706a94b139d00 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
parent7c82e1c72872e81ddc66f876d162cf2af66261e5 (diff)
downloadopen-keychain-07704c2726e66b3834834d76c4046b144348b58e.tar.gz
open-keychain-07704c2726e66b3834834d76c4046b144348b58e.tar.bz2
open-keychain-07704c2726e66b3834834d76c4046b144348b58e.zip
Yubikey decryption
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 1b4ad1fc1..090f2ceb6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -526,8 +526,9 @@ public class OpenPgpService extends RemoteService {
"Decryption of symmetric content not supported by API!");
} else if ((pgpResult.getResult() & DecryptVerifyResult.RESULT_PENDING_NFC) ==
DecryptVerifyResult.RESULT_PENDING_NFC) {
- return getNfcDecryptIntent(
- data, pgpResult.getNfcPassphrase(), pgpResult.getNfcEncryptedSessionKey());
+ // we assume that the pin has been cached before
+ String pin = passphraseCacheInterface.getCachedPassphrase(pgpResult.getNfcKeyId());
+ return getNfcDecryptIntent(data, pin, pgpResult.getNfcEncryptedSessionKey());
} else {
throw new PgpGeneralException(
"Encountered unhandled type of pending action not supported by API!");