aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-10-16 13:43:21 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-10-16 13:43:21 +0200
commit4f2e02d6064202689eab0201b2bf06a6c842472d (patch)
treeaa0ecfb0872eb145506f39452c840b190b4ae8f6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parenta83f260cdbe28a0f5ad1094b3c3ebd8044834aa9 (diff)
downloadopen-keychain-4f2e02d6064202689eab0201b2bf06a6c842472d.tar.gz
open-keychain-4f2e02d6064202689eab0201b2bf06a6c842472d.tar.bz2
open-keychain-4f2e02d6064202689eab0201b2bf06a6c842472d.zip
Remove default PIN setting
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java8
1 files changed, 0 insertions, 8 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 5d04317b3..df29a388f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -256,14 +256,6 @@ public class PassphraseCacheService extends Service {
SecretKeyType keyType = keyRing.getSecretKeyType(subKeyId);
switch (keyType) {
- case DIVERT_TO_CARD:
- if (Preferences.getPreferences(this).useDefaultYubiKeyPin()) {
- Log.d(Constants.TAG, "PassphraseCacheService: Using default YubiKey PIN: 123456");
- return new Passphrase("123456"); // default YubiKey PIN, see http://www.yubico.com/2012/12/yubikey-neo-openpgp/
- } else {
- Log.d(Constants.TAG, "PassphraseCacheService: NOT using default YubiKey PIN");
- break;
- }
case PASSPHRASE_EMPTY:
return new Passphrase("");
case UNAVAILABLE: