diff options
| -rw-r--r-- | !uploader/ectester.cap | bin | 14877 -> 14877 bytes | |||
| -rw-r--r-- | dist/ECTester.jar | bin | 709688 -> 709699 bytes | |||
| -rw-r--r-- | jcbuild.xml | 5 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/applet/ECTesterApplet.java | 6 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/applet/EC_Consts.java | 2 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/reader/Util.java | 2 |
6 files changed, 10 insertions, 5 deletions
diff --git a/!uploader/ectester.cap b/!uploader/ectester.cap Binary files differindex e5d5183..c0b0b0b 100644 --- a/!uploader/ectester.cap +++ b/!uploader/ectester.cap diff --git a/dist/ECTester.jar b/dist/ECTester.jar Binary files differindex 691d575..8e690e8 100644 --- a/dist/ECTester.jar +++ b/dist/ECTester.jar diff --git a/jcbuild.xml b/jcbuild.xml index a4d7619..793060c 100644 --- a/jcbuild.xml +++ b/jcbuild.xml @@ -23,4 +23,9 @@ <exec dir="!uploader" executable="./gppro_upload.sh" osfamily="unix"/> <exec dir="!uploader" executable="./gppro_upload.bat" osfamily="windows"/> </target> + + <target name="upload-emv" depends="build" description="Uploads the CAP file to the card, using gp.jar, uses the EMV protocol"> + <exec dir="!uploader" executable="./gppro_upload_emv.sh" osfamily="unix"/> + <exec dir="!uploader" executable="./gppro_upload_emv.bat" osfamily="windows"/> + </target> </project> diff --git a/src/cz/crcs/ectester/applet/ECTesterApplet.java b/src/cz/crcs/ectester/applet/ECTesterApplet.java index f957273..a7d8537 100644 --- a/src/cz/crcs/ectester/applet/ECTesterApplet.java +++ b/src/cz/crcs/ectester/applet/ECTesterApplet.java @@ -645,17 +645,17 @@ public class ECTesterApplet extends Applet implements ExtendedLength { if (keyTester.hasECDH()) { Util.setShort(buffer, offset, ecdhSW); } else { - Util.setShort(buffer, offset, ISO7816.SW_INS_NOT_SUPPORTED); + Util.setShort(buffer, offset, ISO7816.SW_FUNC_NOT_SUPPORTED); } if (keyTester.hasECDHC()) { Util.setShort(buffer, (short) (offset + 2), ecdhcSW); } else { - Util.setShort(buffer, (short) (offset + 2), ISO7816.SW_INS_NOT_SUPPORTED); + Util.setShort(buffer, (short) (offset + 2), ISO7816.SW_FUNC_NOT_SUPPORTED); } if (keyTester.hasECDSA()) { Util.setShort(buffer, (short) (offset + 4), ecdsaSW); } else { - Util.setShort(buffer, (short) (offset + 4), ISO7816.SW_INS_NOT_SUPPORTED); + Util.setShort(buffer, (short) (offset + 4), ISO7816.SW_FUNC_NOT_SUPPORTED); } return 6; diff --git a/src/cz/crcs/ectester/applet/EC_Consts.java b/src/cz/crcs/ectester/applet/EC_Consts.java index 0276019..53eab41 100644 --- a/src/cz/crcs/ectester/applet/EC_Consts.java +++ b/src/cz/crcs/ectester/applet/EC_Consts.java @@ -990,7 +990,7 @@ public class EC_Consts { public static final byte F2M_CURVES = (byte) 12; - public static final short[] FP_SIZES = new short[]{128, 160, 192, 224, 256, 384, 521}; + public static final short[] FP_SIZES = new short[]{112, 128, 160, 192, 224, 256, 384, 512, 521}; public static final short[] F2M_SIZES = new short[]{163, 233, 283, 409, 571}; public static byte getCurve(short keyLength, byte keyClass) { diff --git a/src/cz/crcs/ectester/reader/Util.java b/src/cz/crcs/ectester/reader/Util.java index 3a7e9fe..e7b7338 100644 --- a/src/cz/crcs/ectester/reader/Util.java +++ b/src/cz/crcs/ectester/reader/Util.java @@ -280,7 +280,7 @@ public class Util { return "OK\t(0x9000)"; } else { String str = getSW(sw); - return String.format("fail\t(%s,\t0x%04x)", str, sw); + return String.format("fail\t(%s, 0x%04x)", str, sw); } } |