package org.average.nfcauthcr;
-import java.io.IOException;
-
-import android.os.Bundle;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.PendingIntent;
import android.util.Log;
import android.widget.Toast;
+import org.average.nfcauthcr.NFCAuthCRYubiNeo;
+
public class NFCAuthCRCheck extends Activity {
private final String TAG = getClass().getName();
- private static final byte[] selectCommand =
- {0x00, (byte) 0xA4, 0x04, 0x00, 0x07, (byte) 0xA0,
- 0x00, 0x00, 0x05, 0x27, 0x20, 0x01, 0x00};
-
private AlertDialog swipeDialog;
private PendingIntent tagIntent;
Log.v(TAG, "Starting the work");
Intent intent = getIntent();
- Bundle extras = intent.getExtras();
setResult(RESULT_CANCELED);
- if(swipeDialog != null) {
+ if (swipeDialog != null) {
swipeDialog.dismiss();
swipeDialog = null;
}
- if(extras != null) {
- int slot = extras.getInt("slot");
- if (slot > 0) {
- swipeDialog = makeDialog();
- swipeDialog.show();
- enableDispatch(slot);
- }
+ int slot = intent.getIntExtra("slot", -1);
+ if (slot > 0) {
+ swipeDialog = makeDialog();
+ swipeDialog.show();
+ enableDispatch(slot);
}
}
public void onNewIntent(Intent intent) {
Log.v(TAG, "NFC Intent arrived");
int slot = intent.getIntExtra("slot", -1);
+ byte[] challenge = intent.getByteArrayExtra("challenge");
if (slot <= 0) return;
Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
if (tag == null) return;
IsoDep isoTag = IsoDep.get(tag);
- try {
- isoTag.connect();
- byte[] resp = isoTag.transceive(selectCommand);
- int length = resp.length;
- if (resp[length - 2] == (byte)0x90 &&
- resp[length - 1] == 0x00) {
- doChallengeYubiKey(isoTag, slot);
- } else {
- Toast.makeText(this, R.string.tag_error,
- Toast.LENGTH_LONG).show();
- }
- } catch (TagLostException e) {
- Toast.makeText(this,
- R.string.tag_lost, Toast.LENGTH_LONG).show();
- } catch (IOException e) {
- Toast.makeText(this,
- getText(R.string.tag_error) +
- e.getMessage(),
- Toast.LENGTH_LONG).show();
+ byte[] response = NFCAuthCRYubiNeo.doChallengeYubiKey(
+ isoTag, slot, challenge);
+ if (response != null) {
+ Intent data = getIntent();
+ data.putExtra("response", response);
+ setResult(RESULT_OK, data);
}
finish();
}
adapter.disableForegroundDispatch(this);
}
}
-
- private void doChallengeYubiKey(IsoDep isoTag, int slot)
- throws IOException {
- Intent data = getIntent();
- data.putExtra("response","<FIXME>real data here");
- setResult(RESULT_OK, data);
- }
}