diff --git a/ACardEmulator/app/app.iml b/ACardEmulator/app/app.iml index d03af7a..142fb6d 100644 --- a/ACardEmulator/app/app.iml +++ b/ACardEmulator/app/app.iml @@ -59,7 +59,6 @@ - @@ -70,23 +69,12 @@ - - - - - - - - - - - diff --git a/ACardEmulator/app/build.gradle b/ACardEmulator/app/build.gradle index 2ec69db..68c7312 100644 --- a/ACardEmulator/app/build.gradle +++ b/ACardEmulator/app/build.gradle @@ -22,7 +22,6 @@ android { main.java.srcDirs += 'src/main/external/android-scio/src/main' main.java.srcDirs += 'src/main/external/ykneo-openpgp/applet/src' main.java.srcDirs += 'src/main/external/ykneo-oath/applet/src' - main.java.srcDirs += 'src/main/external/MuscleApplet/src' } } diff --git a/ACardEmulator/app/src/main/external/MuscleApplet b/ACardEmulator/app/src/main/external/MuscleApplet deleted file mode 160000 index d005f36..0000000 --- a/ACardEmulator/app/src/main/external/MuscleApplet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d005f36209bdd7020bac0d783b228243126fd2f8 diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java index f3b4bf5..3c2fc6b 100644 --- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java +++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java @@ -30,7 +30,6 @@ import com.licel.jcardsim.base.Simulator; import com.licel.jcardsim.base.SimulatorRuntime; import com.licel.jcardsim.samples.HelloWorldApplet; import com.licel.jcardsim.utils.AIDUtil; -import com.musclecard.CardEdge.CardEdge; import net.pwendland.javacard.pki.isoapplet.IsoApplet; @@ -115,21 +114,6 @@ public class SimulatorService extends HostApduService { extra_error += "\n" + "Could not install " + name + " (AID: " + aid + ")"; } - name = getResources().getString(R.string.applet_muscle); - aid = getResources().getString(R.string.aid_muscle); - try { - - byte[] aid_bytes = Util.hexStringToByteArray(aid); - byte[] inst_params = new byte[aid.length()+1]; - inst_params[0] = (byte) aid_bytes.length; - System.arraycopy(aid_bytes, 0, inst_params, 1, aid_bytes.length); - simulator.installApplet(AIDUtil.create(aid), CardEdge.class, inst_params, (short) 0, (byte) inst_params.length); - extra_install += "\n" + name + " (AID: " + aid + ")"; - } catch (Exception e) { - e.printStackTrace(); - extra_error += "\n" + "Could not install " + name + " (AID: " + aid + ")"; - } - Intent i = new Intent(TAG); if (!extra_error.isEmpty()) i.putExtra(EXTRA_ERROR, extra_error); diff --git a/ACardEmulator/app/src/main/res/values/strings.xml b/ACardEmulator/app/src/main/res/values/strings.xml index e5efe47..35a4262 100644 --- a/ACardEmulator/app/src/main/res/values/strings.xml +++ b/ACardEmulator/app/src/main/res/values/strings.xml @@ -23,8 +23,6 @@ Yubico\'s OpenPGP Applet A000000527210101 Yubico\'s OATH Applet - A00000000101 - MUSCLE Applet Tap To Emulate! The following smart card applets are supported:\n \n @@ -32,7 +30,6 @@ OpenPGP Applet (AID D2760001240102000000000000010000)\n OATH Applet (AID A000000527210101)\n ISO Applet (AID F276A288BCFBA69D34F31001)\n - MUSCLE Applet (AID A00000000101)\n \n Place your device on a contact-less reader. When the reader issues a SELECT command for one of the application identifiers above, the emulator creates the appropriate applet. The emulated applet will then handle all subsequent APDUs. diff --git a/ACardEmulator/app/src/main/res/xml/aid_list.xml b/ACardEmulator/app/src/main/res/xml/aid_list.xml index eceb142..3aa2f46 100644 --- a/ACardEmulator/app/src/main/res/xml/aid_list.xml +++ b/ACardEmulator/app/src/main/res/xml/aid_list.xml @@ -21,8 +21,4 @@ - - - -