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

ACardEmulator: added MUSCLE Applet

Browse Source
This commit is contained in:
Frank Morgner
2015-07-28 19:01:36 +02:00
parent f681ad067a
commit ded801f55d
7 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -14,3 +14,6 @@
[submodule "ACardEmulator/app/src/main/external/jcardsim"]
path = ACardEmulator/app/src/main/external/jcardsim
url = https://github.com/frankmorgner/jcardsim.git
[submodule "ACardEmulator/app/src/main/external/MuscleApplet"]
path = ACardEmulator/app/src/main/external/MuscleApplet
url = https://github.com/martinpaljak/MuscleApplet.git

1
ACardEmulator/app/app.iml
View File

@@ -58,6 +58,7 @@
<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" />

1
ACardEmulator/app/build.gradle
View File

@@ -32,6 +32,7 @@ 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

Submodule ACardEmulator/app/src/main/external/MuscleApplet added at d005f36209

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

@@ -30,6 +30,7 @@ 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;
@@ -114,6 +115,16 @@ 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 {
simulator.installApplet(AIDUtil.create(aid), CardEdge.class);
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);

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

@@ -21,5 +21,7 @@
<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>
</resources>

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

@@ -20,4 +20,8 @@
<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>