1 files changed, 8 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
index cd2d9cb85..fb2209d3e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
@@ -43,6 +43,7 @@ public class NfcActivity extends ActionBarActivity {
 
     // always
     public static final String EXTRA_PIN = "pin";
+    public static final String EXTRA_FINGERPRINT = "fingerprint";
     // special extra for OpenPgpService
     public static final String EXTRA_DATA = "data";
 
@@ -63,6 +64,8 @@ public class NfcActivity extends ActionBarActivity {
 
     private String mPin;
 
+    private byte[] mFingerprint;
+
     // sign
     private byte[] mHashToSign;
     private int mHashAlgo;
@@ -83,6 +86,9 @@ public class NfcActivity extends ActionBarActivity {
         Bundle data = intent.getExtras();
         String action = intent.getAction();
 
+        // TODO check fingerprint
+        // mFingerprint = data.getByteArray(EXTRA_FINGERPRINT);
+
         if (ACTION_SIGN_HASH.equals(action)) {
             mAction = action;
             mPin = data.getString(EXTRA_PIN);
@@ -369,9 +375,8 @@ public class NfcActivity extends ActionBarActivity {
         }
 
         // Make sure the signature we received is actually the expected number of bytes long!
-        // TODO this is only right for RSA 2048 bit keys. Do we support anything else right now?
-        if (signature.length() != 512) {
-            toast("Bad signature length! Expected 256 bytes, got " + signature.length() / 2);
+        if (signature.length() != 256 && signature.length() != 512) {
+            toast("Bad signature length! Expected 128 or 256 bytes, got " + signature.length() / 2);
             return null;
         }