cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add (optional) keyId check in NfcActivity

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-09-30 01:47:04 +02:00
parent dabdda36cf
commit bd3f6a22cb
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
View File

@@ -45,8 +45,8 @@ public class NfcActivity extends ActionBarActivity {
public static final String ACTION_DECRYPT_SESSION_KEY = "decrypt_session_key"; public static final String ACTION_DECRYPT_SESSION_KEY = "decrypt_session_key";
// always // always
public static final String EXTRA_KEY_ID = "key_id";
public static final String EXTRA_PIN = "pin"; public static final String EXTRA_PIN = "pin";
public static final String EXTRA_FINGERPRINT = "fingerprint";
// special extra for OpenPgpService // special extra for OpenPgpService
public static final String EXTRA_DATA = "data"; public static final String EXTRA_DATA = "data";
@@ -66,8 +66,7 @@ public class NfcActivity extends ActionBarActivity {
private String mAction; private String mAction;
private String mPin; private String mPin;
private Long mKeyId;
private byte[] mFingerprint;
// sign // sign
private byte[] mHashToSign; private byte[] mHashToSign;
@@ -89,8 +88,10 @@ public class NfcActivity extends ActionBarActivity {
Bundle data = intent.getExtras(); Bundle data = intent.getExtras();
String action = intent.getAction(); String action = intent.getAction();
// TODO check fingerprint // if we get are passed a key id, save it for the check
// mFingerprint = data.getByteArray(EXTRA_FINGERPRINT); if (data.containsKey(EXTRA_KEY_ID)) {
mKeyId = data.getLong(EXTRA_KEY_ID);
}
if (ACTION_SIGN_HASH.equals(action)) { if (ACTION_SIGN_HASH.equals(action)) {
mAction = action; mAction = action;
@@ -204,6 +205,19 @@ public class NfcActivity extends ActionBarActivity {
return; return;
} }
// If we were supplied with a key id for checking, do so
if (mKeyId != null) {
// We always check the master key id
long keyId = nfcGetKeyId(mIsoDep, 0);
// If it's wrong, just cancel
if (keyId != mKeyId) {
toast("NFC Tag has wrong key id!");
setResult(RESULT_CANCELED, mServiceIntent);
finish();
return;
}
}
// Command APDU for VERIFY command (page 32) // Command APDU for VERIFY command (page 32)
String login = String login =
"00" // CLA "00" // CLA
@@ -246,6 +260,7 @@ public class NfcActivity extends ActionBarActivity {
setResult(RESULT_OK, mServiceIntent); setResult(RESULT_OK, mServiceIntent);
finish(); finish();
} }
} }
/** /**