VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

removed MUSCLE applet

Browse Source 
it never worked with OpenSC anyway
This commit is contained in:
Frank Morgner
2016-02-09 08:11:01 +01:00
parent 2caffed6a1
commit 74f15ae9ef
6 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ACardEmulator/app/app.iml
View File

@@ -59,7 +59,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/external/android-scio/src/main" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/external/ykneo-openpgp/applet/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/external/ykneo-oath/applet/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/external/MuscleApplet/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -70,23 +69,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

1
ACardEmulator/app/build.gradle
View File

@@ -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'
}
}

1
ACardEmulator/app/src/main/external/MuscleApplet vendored

Submodule ACardEmulator/app/src/main/external/MuscleApplet deleted from d005f36209

16
ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SimulatorService.java
View File

@@ -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);

3
ACardEmulator/app/src/main/res/values/strings.xml
View File

@@ -23,8 +23,6 @@
<string name="applet_openpgp">Yubico\'s OpenPGP Applet</string>
<string name="aid_oath">A000000527210101</string>
<string name="applet_oath">Yubico\'s OATH Applet</string>
<string name="aid_muscle">A00000000101</string>
<string name="applet_muscle">MUSCLE Applet</string>
<string name="startup_title">Tap To Emulate!</string>
<string name="startup_message">The following smart card applets are supported:\n
\n
@@ -32,7 +30,6 @@
<b>OpenPGP Applet</b> <small>(AID D2760001240102000000000000010000)</small>\n
<b>OATH Applet</b> <small>(AID A000000527210101)</small>\n
<b>ISO Applet</b> <small>(AID F276A288BCFBA69D34F31001)</small>\n
<b>MUSCLE Applet</b> <small>(AID A00000000101)</small>\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.</string>

4
ACardEmulator/app/src/main/res/xml/aid_list.xml
View File

@@ -21,8 +21,4 @@
<aid-filter android:name="@string/aid_isoapplet"/>
</aid-group>
<aid-group android:description="@string/applet_muscle" android:category="other">
<aid-filter android:name="@string/aid_muscle"/>
</aid-group>
</host-apdu-service>