diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cz/crcs/ectester/applet/AppletBase.java | 2 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/common/ec/EC_Category.java | 63 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/common/util/CardUtil.java | 11 |
3 files changed, 26 insertions, 50 deletions
diff --git a/src/cz/crcs/ectester/applet/AppletBase.java b/src/cz/crcs/ectester/applet/AppletBase.java index aa6bc07..24272c5 100644 --- a/src/cz/crcs/ectester/applet/AppletBase.java +++ b/src/cz/crcs/ectester/applet/AppletBase.java @@ -58,7 +58,7 @@ public abstract class AppletBase extends Applet { // public static final byte[] VERSION = {'v', '0', '.', '3', '.', '0'}; - public static final short ARRAY_LENGTH = 0xff; + public static final short ARRAY_LENGTH = 0x100; public static final short APDU_MAX_LENGTH = 1024; // TEMPORARRY ARRAY IN RAM diff --git a/src/cz/crcs/ectester/common/ec/EC_Category.java b/src/cz/crcs/ectester/common/ec/EC_Category.java index 8af308c..05c910c 100644 --- a/src/cz/crcs/ectester/common/ec/EC_Category.java +++ b/src/cz/crcs/ectester/common/ec/EC_Category.java @@ -91,56 +91,21 @@ public class EC_Category { out.append(System.lineSeparator()); } - Map<String, EC_Key> keys = getObjects(EC_Key.class); - size = keys.size(); - if (size > 0) { - out.append(Colors.bold("\t\tKeys: ")); - for (Map.Entry<String, EC_Key> key : keys.entrySet()) { - out.append(key.getKey()); - size--; - if (size > 0) - out.append(", "); + String[] headers = new String[]{"Public keys", "Private keys", "KeyPairs", "Results(KA)", "Results(SIG)"}; + Class[] classes = new Class[]{EC_Key.Public.class, EC_Key.Private.class, EC_Keypair.class, EC_KAResult.class, EC_SigResult.class}; + for (int i = 0; i < headers.length; ++i) { + Map<String, EC_Data> data = getObjects(classes[i]); + size = data.size(); + if (size > 0) { + out.append(Colors.bold(String.format("\t\t%s: ", headers[i]))); + for (Map.Entry<String, EC_Data> key : data.entrySet()) { + out.append(key.getKey()); + size--; + if (size > 0) + out.append(", "); + } + out.append(System.lineSeparator()); } - out.append(System.lineSeparator()); - } - - Map<String, EC_Keypair> keypairs = getObjects(EC_Keypair.class); - size = keypairs.size(); - if (size > 0) { - out.append(Colors.bold("\t\tKeypairs: ")); - for (Map.Entry<String, EC_Keypair> key : keypairs.entrySet()) { - out.append(key.getKey()); - size--; - if (size > 0) - out.append(", "); - } - out.append(System.lineSeparator()); - } - - Map<String, EC_KAResult> kaResults = getObjects(EC_KAResult.class); - size = kaResults.size(); - if (size > 0) { - out.append(Colors.bold("\t\tResults(KA): ")); - for (Map.Entry<String, EC_KAResult> result : kaResults.entrySet()) { - out.append(result.getKey()); - size--; - if (size > 0) - out.append(", "); - } - out.append(System.lineSeparator()); - } - - Map<String, EC_SigResult> sigResults = getObjects(EC_SigResult.class); - size = sigResults.size(); - if (size > 0) { - out.append(Colors.bold("\t\tResults(SIG): ")); - for (Map.Entry<String, EC_SigResult> result : sigResults.entrySet()) { - out.append(result.getKey()); - size--; - if (size > 0) - out.append(", "); - } - out.append(System.lineSeparator()); } return out.toString(); } diff --git a/src/cz/crcs/ectester/common/util/CardUtil.java b/src/cz/crcs/ectester/common/util/CardUtil.java index 4f7a29a..7483c32 100644 --- a/src/cz/crcs/ectester/common/util/CardUtil.java +++ b/src/cz/crcs/ectester/common/util/CardUtil.java @@ -327,16 +327,22 @@ public class CardUtil { public static byte getKAType(String kaTypeString) { switch (kaTypeString) { + case "DH": case "ALG_EC_SVDP_DH": return EC_Consts.KeyAgreement_ALG_EC_SVDP_DH; + case "DH_PLAIN": case "ALG_EC_SVDP_DH_PLAIN": return EC_Consts.KeyAgreement_ALG_EC_SVDP_DH_PLAIN; + case "PACE_GM": case "ALG_EC_PACE_GM": return EC_Consts.KeyAgreement_ALG_EC_PACE_GM; + case "DH_PLAIN_XY": case "ALG_EC_SVDP_DH_PLAIN_XY": return EC_Consts.KeyAgreement_ALG_EC_SVDP_DH_PLAIN_XY; + case "DHC": case "ALG_EC_SVDP_DHC": return EC_Consts.KeyAgreement_ALG_EC_SVDP_DHC; + case "DHC_PLAIN": case "ALG_EC_SVDP_DHC_PLAIN": return EC_Consts.KeyAgreement_ALG_EC_SVDP_DHC_PLAIN; default: @@ -373,14 +379,19 @@ public class CardUtil { public static byte getSigType(String sigTypeString) { switch (sigTypeString) { + case "ECDSA_SHA": case "ALG_ECDSA_SHA": return EC_Consts.Signature_ALG_ECDSA_SHA; + case "ECDSA_SHA_224": case "ALG_ECDSA_SHA_224": return EC_Consts.Signature_ALG_ECDSA_SHA_224; + case "ECDSA_SHA_256": case "ALG_ECDSA_SHA_256": return EC_Consts.Signature_ALG_ECDSA_SHA_256; + case "ECDSA_SHA_384": case "ALG_ECDSA_SHA_384": return EC_Consts.Signature_ALG_ECDSA_SHA_384; + case "ECDSA_SHA_512": case "ALG_ECDSA_SHA_512": return EC_Consts.Signature_ALG_ECDSA_SHA_512; default: |