diff options
| author | J08nY | 2017-12-27 18:29:52 +0100 |
|---|---|---|
| committer | J08nY | 2017-12-27 18:29:52 +0100 |
| commit | f40db310cdb28d39e1bb050e9adb920f4b35a8ed (patch) | |
| tree | d4a97d56aa5bf274569fe0cf1aa9645a6ebe9d31 /src/cz/crcs/ectester/data/EC_Store.java | |
| parent | 71006eb01c60b3556b620b7d4579d65ed6f86926 (diff) | |
| download | ECTester-f40db310cdb28d39e1bb050e9adb920f4b35a8ed.tar.gz ECTester-f40db310cdb28d39e1bb050e9adb920f4b35a8ed.tar.zst ECTester-f40db310cdb28d39e1bb050e9adb920f4b35a8ed.zip | |
Cleanup the applet ECKA and Signature objects.
Diffstat (limited to 'src/cz/crcs/ectester/data/EC_Store.java')
| -rw-r--r-- | src/cz/crcs/ectester/data/EC_Store.java | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java index 3103c1d..c25be4e 100644 --- a/src/cz/crcs/ectester/data/EC_Store.java +++ b/src/cz/crcs/ectester/data/EC_Store.java @@ -2,6 +2,7 @@ package cz.crcs.ectester.data; import cz.crcs.ectester.applet.EC_Consts; import cz.crcs.ectester.common.ec.*; +import cz.crcs.ectester.common.util.CardUtil; import javacard.security.KeyPair; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -217,25 +218,7 @@ public class EC_Store { descs = descc.item(0).getTextContent(); } - byte kab = EC_Consts.KA_ANY; - switch (ka.getTextContent()) { - case "DH": - case "ECDH": - kab = EC_Consts.KA_ECDH; - break; - case "DHC": - case "ECDHC": - kab = EC_Consts.KA_ECDHC; - break; - case "ANY": - kab = EC_Consts.KA_ANY; - break; - case "BOTH": - kab = EC_Consts.KA_BOTH; - break; - } - - EC_KAResult kaResult = new EC_KAResult(id.getTextContent(), kab, curve.getTextContent(), onekey.getTextContent(), otherkey.getTextContent(), descs); + EC_KAResult kaResult = new EC_KAResult(id.getTextContent(), ka.getTextContent(), curve.getTextContent(), onekey.getTextContent(), otherkey.getTextContent(), descs); InputStream csv = parseDataElement(dir, elem); if (!kaResult.readCSV(csv)) { |