1 files changed, 9 insertions, 0 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 ae1b026a5..8cd9876eb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -37,6 +37,7 @@ import android.os.RemoteException;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.util.LongSparseArray;
 
+import org.spongycastle.bcpg.S2K;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.Preferences;
@@ -198,10 +199,18 @@ public class PassphraseCacheService extends Service {
         Log.d(Constants.TAG, "PassphraseCacheService.getCachedPassphraseImpl() for masterKeyId " + keyId);
         CanonicalizedSecretKeyRing key = new ProviderHelper(this).getCanonicalizedSecretKeyRing(
                 KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(keyId));
+
         // no passphrase needed? just add empty string and return it, then
         if (!key.hasPassphrase()) {
             Log.d(Constants.TAG, "Key has no passphrase! Caches and returns empty passphrase!");
 
+            // TODO: HACK for yubikeys
+            if (key.getSecretKey().getSecretKey().getS2K().getType() == S2K.GNU_DUMMY_S2K
+                    && key.getSecretKey().getSecretKey().getS2K().getProtectionMode() == 2) {
+                // NFC!
+                return "123456";
+            }
+
             try {
                 addCachedPassphrase(this, keyId, "", key.getPrimaryUserIdWithFallback());
             } catch (PgpGeneralException e) {