cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Yubikey decryption

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-24 00:50:58 +02:00
parent 7c82e1c728
commit 07704c2726
8 changed files with 50 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@@ -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!");