diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-05 20:04:07 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-05 20:04:07 +0200 |
commit | 6e3973e26a74acad2e3ab562ea83687ad0c39e2a (patch) | |
tree | 6a97147c7d331c52c3ce041f55b61b774712b687 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java | |
parent | fa9bbdd60cecb2697ae8c331a8e46d61c99d2703 (diff) | |
download | open-keychain-6e3973e26a74acad2e3ab562ea83687ad0c39e2a.tar.gz open-keychain-6e3973e26a74acad2e3ab562ea83687ad0c39e2a.tar.bz2 open-keychain-6e3973e26a74acad2e3ab562ea83687ad0c39e2a.zip |
Add experimental support for yubikey PINs, remove caching of empty passphrases
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java index fe5c88f62..1218760da 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -213,15 +213,13 @@ public class PassphraseCacheService extends Service { SecretKeyType keyType = keyRing.getSecretKeyType(subKeyId); switch (keyType) { - // TODO: HACK for yubikeys case DIVERT_TO_CARD: - return "123456"; - case PASSPHRASE_EMPTY: - try { - addCachedPassphrase(this, subKeyId, "", keyRing.getPrimaryUserIdWithFallback()); - } catch (PgpGeneralException e) { - Log.d(Constants.TAG, "PgpGeneralException occured"); + if (Preferences.getPreferences(this).useDefaultYubikeyPin()) { + return "123456"; // default Yubikey PIN, see http://www.yubico.com/2012/12/yubikey-neo-openpgp/ + } else { + break; } + case PASSPHRASE_EMPTY: return ""; case UNAVAILABLE: throw new NotFoundException("secret key for this subkey is not available"); |