From a0d60dab1717e69b6d853eb91d0065fe378e3c28 Mon Sep 17 00:00:00 2001 From: Eugene Crosser Date: Fri, 3 May 2013 12:21:41 +0400 Subject: [PATCH] Renamed classes --- AndroidManifest.xml | 4 +- .../{NFCAuthCRCheck.java => Check.java} | 6 +- .../{NFCAuthCREnroll.java => Enroll.java} | 4 +- .../{NFCAuthCRYubiNeo.java => YkNeo.java} | 56 ++++++++----------- 4 files changed, 31 insertions(+), 39 deletions(-) rename src/org/average/nfcauthcr/{NFCAuthCRCheck.java => Check.java} (95%) rename src/org/average/nfcauthcr/{NFCAuthCREnroll.java => Enroll.java} (97%) rename src/org/average/nfcauthcr/{NFCAuthCRYubiNeo.java => YkNeo.java} (55%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index efcae30..684cae9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -15,14 +15,14 @@ android:allowBackup="true" android:theme="@style/AppTheme"> - - diff --git a/src/org/average/nfcauthcr/NFCAuthCRCheck.java b/src/org/average/nfcauthcr/Check.java similarity index 95% rename from src/org/average/nfcauthcr/NFCAuthCRCheck.java rename to src/org/average/nfcauthcr/Check.java index ea37128..c3738f7 100644 --- a/src/org/average/nfcauthcr/NFCAuthCRCheck.java +++ b/src/org/average/nfcauthcr/Check.java @@ -13,9 +13,9 @@ import android.nfc.tech.IsoDep; import android.util.Log; import android.widget.Toast; -import org.average.nfcauthcr.NFCAuthCRYubiNeo; +import org.average.nfcauthcr.YkNeo; -public class NFCAuthCRCheck extends Activity { +public class Check extends Activity { private final String TAG = getClass().getName(); @@ -61,7 +61,7 @@ public class NFCAuthCRCheck extends Activity { Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); if (tag == null) return; IsoDep isoTag = IsoDep.get(tag); - byte[] response = NFCAuthCRYubiNeo.doChallengeYubiKey( + byte[] response = YkNeo.doChallengeYubiKey( isoTag, slot, challenge); if (response != null) { Intent data = getIntent(); diff --git a/src/org/average/nfcauthcr/NFCAuthCREnroll.java b/src/org/average/nfcauthcr/Enroll.java similarity index 97% rename from src/org/average/nfcauthcr/NFCAuthCREnroll.java rename to src/org/average/nfcauthcr/Enroll.java index 50933cb..9f9d535 100644 --- a/src/org/average/nfcauthcr/NFCAuthCREnroll.java +++ b/src/org/average/nfcauthcr/Enroll.java @@ -15,9 +15,9 @@ import android.view.View; import android.widget.TextView; import android.widget.RadioButton; -import org.average.nfcauthcr.NFCAuthCRCheck; +import org.average.nfcauthcr.Check; -public class NFCAuthCREnroll extends Activity { +public class Enroll extends Activity { private final String TAG = getClass().getName(); diff --git a/src/org/average/nfcauthcr/NFCAuthCRYubiNeo.java b/src/org/average/nfcauthcr/YkNeo.java similarity index 55% rename from src/org/average/nfcauthcr/NFCAuthCRYubiNeo.java rename to src/org/average/nfcauthcr/YkNeo.java index 67596e6..a291eab 100644 --- a/src/org/average/nfcauthcr/NFCAuthCRYubiNeo.java +++ b/src/org/average/nfcauthcr/YkNeo.java @@ -7,26 +7,18 @@ import android.nfc.NfcAdapter; import android.nfc.Tag; import android.nfc.TagLostException; import android.nfc.tech.IsoDep; -import android.util.Log; +//import android.util.Log; -import org.average.nfcauthcr.NFCAuthCRYubiNeo; - -public class NFCAuthCRYubiNeo { - - private static final String TAG = "NFCAuthCRYubiNeo"; - - // Is it CCID APDU? ISO 7816-4? +public class YkNeo { + // This is a CCID APDU, ISO 7816-4. // 00 A4 04 00 xx AID - GlobalPlatform - SELECT - // Le send data = 07: A0 00 00 05 27 20 01 - // Le recv data = 00 - private static final byte[] selectCommand = + // Lc, send data = 07: A0 00 00 05 27 20 01 + // Le, recv data = 00 + private static final byte[] selectApdu = {0x00, (byte) 0xA4, 0x04, 0x00, 0x07, (byte) 0xA0, 0x00, 0x00, 0x05, 0x27, 0x20, 0x01, 0x00}; - private static final byte[] crCommand = - {0x00, 0x01, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; - private static final byte SLOT_CHAL_HMAC1 = 0x30; private static final byte SLOT_CHAL_HMAC2 = 0x38; @@ -34,45 +26,45 @@ public class NFCAuthCRYubiNeo { byte[] challenge) { try { isoTag.connect(); - byte[] resp = isoTag.transceive(selectCommand); + byte[] resp = isoTag.transceive(selectApdu); int length = resp.length; - Log.v(TAG, "response to select length is " + length); + //Log.v(TAG, "response to select length is " + length); if (resp[length - 2] != (byte)0x90 || resp[length - 1] != 0x00) { - Log.v(TAG, "Wrong response to select"); + //Log.v(TAG, "Wrong response to select"); //Toast.makeText(this, R.string.tag_error, // Toast.LENGTH_LONG).show(); return null; } - byte[] apdu = new byte[69]; - apdu[0] = 0x00; // CLA - apdu[1] = 0x01; // INS + byte[] crApdu = new byte[69]; + crApdu[0] = 0x00; // CLA + crApdu[1] = 0x01; // INS switch (slot) { - case 1: apdu[2] = SLOT_CHAL_HMAC1; break; // P1 - case 2: apdu[2] = SLOT_CHAL_HMAC2; break; // P1 + case 1: crApdu[2] = SLOT_CHAL_HMAC1; break; // P1 + case 2: crApdu[2] = SLOT_CHAL_HMAC2; break; // P1 } - apdu[3] = 0x00; // P2 - apdu[4] = 63; // Lc - System.arraycopy(challenge, 0, apdu, 5, - challenge.length); - apdu[apdu.length-1] = 22; - resp = isoTag.transceive(apdu); + crApdu[3] = 0x00; // P2 + crApdu[4] = 63; // Lc + System.arraycopy(challenge, 0, crApdu, 5, + challenge.length); // Payload + crApdu[crApdu.length-1] = 22; // Le + resp = isoTag.transceive(crApdu); length = resp.length; if (resp[length - 2] != (byte)0x90 || resp[length - 1] != 0x00) { - Log.v(TAG, "Wrong response to challenge"); + //Log.v(TAG, "Wrong response to challenge"); //Toast.makeText(this, R.string.tag_error, // Toast.LENGTH_LONG).show(); return null; } - Log.v(TAG, "response to challenge length is " + length); + //Log.v(TAG, "response to challenge length is " + length); return Arrays.copyOf(resp, length-2); } catch (TagLostException e) { - Log.v(TAG, e.getMessage()); + //Log.v(TAG, e.getMessage()); //Toast.makeText(this, // R.string.tag_lost, Toast.LENGTH_LONG).show(); } catch (IOException e) { - Log.v(TAG, e.getMessage()); + //Log.v(TAG, e.getMessage()); //Toast.makeText(this, // getText(R.string.tag_error) + // e.getMessage(), -- 2.39.2