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

fixed obsolete reference to Hello world applet

Browse Source 
fixes https://github.com/frankmorgner/vsmartcard/issues/163
regression from 1caff4f497
This commit is contained in:
Frank Morgner
2020-04-25 02:19:29 +02:00
parent feeb732810
commit 920bc701c9
6 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ACardEmulator/README.md
View File

@@ -9,7 +9,6 @@ APDUs are then returned to the smart card reader.
With the built-in Java Card runtime of [jCardSim](http://www.jcardsim.org/) the With the built-in Java Card runtime of [jCardSim](http://www.jcardsim.org/) the
app includes the following Applets: app includes the following Applets:
- [Hello World Applet](https://github.com/licel/jcardsim/blob/master/src/main/java/com/licel/jcardsim/samples/HelloWorldApplet.java) (application identifier ``F000000001``)
- [OpenPGP Applet](https://developers.yubico.com/ykneo-openpgp/) (application identifier ``D2760001240102000000000000010000``) - [OpenPGP Applet](https://developers.yubico.com/ykneo-openpgp/) (application identifier ``D2760001240102000000000000010000``)
- [OATH Applet](https://developers.yubico.com/ykneo-oath/) (application identifier ``A000000527210101``) - [OATH Applet](https://developers.yubico.com/ykneo-oath/) (application identifier ``A000000527210101``)
- [ISO Applet](http://www.pwendland.net/IsoApplet/) (application identifier ``F276A288BCFBA69D34F31001``) - [ISO Applet](http://www.pwendland.net/IsoApplet/) (application identifier ``F276A288BCFBA69D34F31001``)

2
ACardEmulator/app/src/main/external/jcardsim vendored

Submodule ACardEmulator/app/src/main/external/jcardsim updated: 48c258ea35...73cc18710c

1
ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java
View File

@@ -184,7 +184,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
// guidelines. // guidelines.
bindPreferenceSummaryToValue(findPreference("emulator")); bindPreferenceSummaryToValue(findPreference("emulator"));
bindPreferenceSummaryToValue(findPreference("activate_helloworld"));
bindPreferenceSummaryToValue(findPreference("activate_pivapplet")); bindPreferenceSummaryToValue(findPreference("activate_pivapplet"));
bindPreferenceSummaryToValue(findPreference("activate_openpgp")); bindPreferenceSummaryToValue(findPreference("activate_openpgp"));
bindPreferenceSummaryToValue(findPreference("activate_oath")); bindPreferenceSummaryToValue(findPreference("activate_oath"));

3
ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/EmulatorSingleton.java
View File

@@ -81,7 +81,6 @@ public class EmulatorSingleton {
Integer.parseInt(SP.getString("port", Integer.toString(VICCEmulator.DEFAULT_PORT)))); Integer.parseInt(SP.getString("port", Integer.toString(VICCEmulator.DEFAULT_PORT))));
} else { } else {
emulator = new JCEmulator(context, emulator = new JCEmulator(context,
SP.getBoolean("activate_helloworld", false),
SP.getBoolean("activate_openpgp", false), SP.getBoolean("activate_openpgp", false),
SP.getBoolean("activate_oath", false), SP.getBoolean("activate_oath", false),
SP.getBoolean("activate_isoapplet", false), SP.getBoolean("activate_isoapplet", false),
@@ -132,4 +131,4 @@ public class EmulatorSingleton {
public static void deactivate() { public static void deactivate() {
emulator.deactivate(); emulator.deactivate();
} }
} }

3
ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/JCEmulator.java
View File

@@ -23,7 +23,6 @@ public class JCEmulator implements Emulator {
public JCEmulator( public JCEmulator(
Context context, Context context,
boolean activate_helloworld,
boolean activate_openpgp, boolean activate_openpgp,
boolean activate_oath, boolean activate_oath,
boolean activate_isoapplet, boolean activate_isoapplet,
@@ -122,4 +121,4 @@ public class JCEmulator implements Emulator {
public void deactivate() { public void deactivate() {
simulator.reset(); simulator.reset();
} }
} }

1
ACardEmulator/doc/README.txt
View File

@@ -26,7 +26,6 @@ device instead of the phone.
With the built-in Java Card runtime of jCardSim_ the app includes the following With the built-in Java Card runtime of jCardSim_ the app includes the following
Applets: Applets:
- `Hello World Applet`_ (application identifier ``F000000001``)
- `OpenPGP Applet`_ (application identifier ``D2760001240102000000000000010000``) - `OpenPGP Applet`_ (application identifier ``D2760001240102000000000000010000``)
- `OATH Applet`_ (application identifier ``A000000527210101``) - `OATH Applet`_ (application identifier ``A000000527210101``)
- `ISO Applet`_ (application identifier ``F276A288BCFBA69D34F31001``) - `ISO Applet`_ (application identifier ``F276A288BCFBA69D34F31001``)