From 4debe5adb4bb486f488878e348ee7bcf386c43f2 Mon Sep 17 00:00:00 2001 From: J08nY Date: Tue, 17 Jan 2017 02:55:31 +0100 Subject: major changes, ECTester rewrite, moved to valid package reader: ECTester, mostly rewritten SimpleAPDU - communication with applet now done through simpler instructions: allocate, set, generate, ecdh, ecdsa - moved to a valid Java package dir cz.crcs.ectester - SimpleAPDU: renamed to ECTester - CardMngr: seamlessly supports simulation vs real card - DirtyLogger: takes a nullable String and creates file - ECTester: currently only supports key generation, curve testing under way - supports external curve setting, example files in data package - tests can be done through files, to achieve a more modular approach - Util: static utility class - ParamReader: reads curve domain parameters and keys from simple csv-like human-readable files with hex strings applet: ECTesterApplet, rewrite of SimpleECCApplet - more granularity in instructions - moved complexity over to the reader side - ECKeyGenerator: now a class that takes KeyPair as param - ECKeyTester: now a class that takes KeyPair as param - EC_Consts: removed ecsp curves(now done externally), removed unused methods - ECTesterApplet: currently only tested instructions are: allocate, set, generate data: contains several curve and pubkey files in format supported by ParamReader - Prime field curves: p,a,b,gx,gy,r,k - Binary field curves: e1,a,b,gx,gy,r,k or e1,e2,e3,a,b,gx,gy,r,k - Public key: wx,wy - Private key: s - Key: wx,wy,s - all values are hex strings --- !uploader/ectester.cap | Bin 0 -> 13349 bytes !uploader/gppro_upload.bat | 2 +- !uploader/gppro_upload.sh | 2 +- !uploader/gppro_upload_emv.bat | 2 +- !uploader/gppro_upload_emv.sh | 8 ++++---- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 !uploader/ectester.cap (limited to '!uploader') diff --git a/!uploader/ectester.cap b/!uploader/ectester.cap new file mode 100644 index 0000000..f829de4 Binary files /dev/null and b/!uploader/ectester.cap differ diff --git a/!uploader/gppro_upload.bat b/!uploader/gppro_upload.bat index 0dd7864..cbfd5ae 100644 --- a/!uploader/gppro_upload.bat +++ b/!uploader/gppro_upload.bat @@ -1,6 +1,6 @@ gp.exe -delete 4543546573746572 -deletedeps -verbose gp.exe -deletedeps -verbose -delete 4A43416C6754657374 -gp.exe -install simpleECC.cap -verbose +gp.exe -install ectester.cap -verbose diff --git a/!uploader/gppro_upload.sh b/!uploader/gppro_upload.sh index faeaf24..47c7c97 100755 --- a/!uploader/gppro_upload.sh +++ b/!uploader/gppro_upload.sh @@ -2,6 +2,6 @@ java -jar gp.jar -delete 4543546573746572 -deletedeps -verbose java -jar gp.jar -deletedeps -verbose -delete 4A43416C6754657374 -java -jar gp.jar -install simpleECC.cap -verbose +java -jar gp.jar -install ectester.cap -verbose diff --git a/!uploader/gppro_upload_emv.bat b/!uploader/gppro_upload_emv.bat index a9b0b9c..737f8ac 100644 --- a/!uploader/gppro_upload_emv.bat +++ b/!uploader/gppro_upload_emv.bat @@ -3,6 +3,6 @@ gp.exe -deletedeps -verbose -emv -delete 4A43416C6754657374 gp.exe -deletedeps -verbose -emv -delete 4543546573746572 -gp.exe -install simpleECC.cap -verbose -emv -d +gp.exe -install ectester.cap -verbose -emv -d diff --git a/!uploader/gppro_upload_emv.sh b/!uploader/gppro_upload_emv.sh index 9a51cd9..8f0c994 100755 --- a/!uploader/gppro_upload_emv.sh +++ b/!uploader/gppro_upload_emv.sh @@ -1,8 +1,8 @@ -java -jar gp.jar -deletedeps -verbose -emv -delete 4C6162616B417070 -java -jar gp.jar -deletedeps -verbose -emv -delete 4A43416C6754657374 -java -jar gp.jar -deletedeps -verbose -emv -delete 4543546573746572 +java -jar gp.jar --deletedeps --verbose -emv --delete 4C6162616B417070 +java -jar gp.jar --deletedeps --verbose -emv --delete 4A43416C6754657374 +java -jar gp.jar --deletedeps --verbose -emv --delete 4543546573746572 -java -jar gp.jar -install simpleECC.cap -verbose -emv -d +java -jar gp.jar --install ectester.cap --verbose --emv -d -- cgit v1.2.3-70-g09d2