From 6e3973e26a74acad2e3ab562ea83687ad0c39e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 5 Sep 2014 20:04:07 +0200 Subject: Add experimental support for yubikey PINs, remove caching of empty passphrases --- .../keychain/service/PassphraseCacheService.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java') 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"); -- cgit v1.2.3