diff options
| author | J08nY | 2017-04-19 21:56:39 +0200 |
|---|---|---|
| committer | J08nY | 2017-04-19 21:56:39 +0200 |
| commit | 3aaead661e2b23b5e5811a3a06daed61db638a72 (patch) | |
| tree | 41312c609ca39d3f8f3fed306130f87a09f61da8 /src/cz/crcs/ectester/data/EC_Store.java | |
| parent | 3e1290ca718aadf6dd2f920107493f2cd8f874ab (diff) | |
| download | ECTester-3aaead661e2b23b5e5811a3a06daed61db638a72.tar.gz ECTester-3aaead661e2b23b5e5811a3a06daed61db638a72.tar.zst ECTester-3aaead661e2b23b5e5811a3a06daed61db638a72.zip | |
Fix some test-vector tests, also test printing
Diffstat (limited to 'src/cz/crcs/ectester/data/EC_Store.java')
| -rw-r--r-- | src/cz/crcs/ectester/data/EC_Store.java | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java index ccd3586..906eb8d 100644 --- a/src/cz/crcs/ectester/data/EC_Store.java +++ b/src/cz/crcs/ectester/data/EC_Store.java @@ -227,11 +227,22 @@ public class EC_Store { descs = descc.item(0).getTextContent(); } - byte kab; - if (ka.getTextContent().equals("DH")) { - kab = EC_Consts.KA_ECDH; - } else { - kab = EC_Consts.KA_ECDHC; + 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); @@ -254,7 +265,7 @@ public class EC_Store { } private EC_Params parseKeylike(String dir, Element elem) throws SAXException, IOException { - Node file = elem.getElementsByTagName("file").item(0); + Node id = elem.getElementsByTagName("id").item(0); Node curve = elem.getElementsByTagName("curve").item(0); NodeList desc = elem.getElementsByTagName("desc"); |