diff options
| author | J08nY | 2018-11-09 19:42:35 +0100 |
|---|---|---|
| committer | J08nY | 2018-11-09 19:42:35 +0100 |
| commit | 9e157bc1d0a42848bb8f780f4f7b294ad535feda (patch) | |
| tree | f2a36762e63501eb3d5c0156146572bda7e80a78 /src/cz/crcs/ectester/applet/ECKeyGenerator.java | |
| parent | f0ae5fdc1ba778acc922d5269a5523a88ca97976 (diff) | |
| download | ECTester-9e157bc1d0a42848bb8f780f4f7b294ad535feda.tar.gz ECTester-9e157bc1d0a42848bb8f780f4f7b294ad535feda.tar.zst ECTester-9e157bc1d0a42848bb8f780f4f7b294ad535feda.zip | |
FIx loading of F2m field, fix some utility functions.
Diffstat (limited to 'src/cz/crcs/ectester/applet/ECKeyGenerator.java')
| -rw-r--r-- | src/cz/crcs/ectester/applet/ECKeyGenerator.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/cz/crcs/ectester/applet/ECKeyGenerator.java b/src/cz/crcs/ectester/applet/ECKeyGenerator.java index 7c52e8f..4326752 100644 --- a/src/cz/crcs/ectester/applet/ECKeyGenerator.java +++ b/src/cz/crcs/ectester/applet/ECKeyGenerator.java @@ -204,11 +204,10 @@ public class ECKeyGenerator { short i1 = Util.getShort(data, (short) (offset + 2)); short i2 = Util.getShort(data, (short) (offset + 4)); short i3 = Util.getShort(data, (short) (offset + 6)); -// if ((key & EC_Consts.KEY_PUBLIC) != 0) ecPublicKey.setFieldF2M(i1, i2, i3); -// if ((key & EC_Consts.KEY_PRIVATE) != 0) ecPrivateKey.setFieldF2M(i1, i2, i3); - // TODO: fix this, ^^ fails on jcardsim, but is up to spec - if ((key & EC_Consts.KEY_PUBLIC) != 0) ecPublicKey.setFieldF2M(i3, i2, i1); - if ((key & EC_Consts.KEY_PRIVATE) != 0) ecPrivateKey.setFieldF2M(i3, i2, i1); + if ((key & EC_Consts.KEY_PUBLIC) != 0) ecPublicKey.setFieldF2M(i1, i2, i3); + if ((key & EC_Consts.KEY_PRIVATE) != 0) ecPrivateKey.setFieldF2M(i1, i2, i3); + // if ((key & EC_Consts.KEY_PUBLIC) != 0) ecPublicKey.setFieldF2M(i3, i2, i1); + // if ((key & EC_Consts.KEY_PRIVATE) != 0) ecPrivateKey.setFieldF2M(i3, i2, i1); } else { sw = ISO7816.SW_UNKNOWN; } |