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 | |
| 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')
| -rw-r--r-- | src/cz/crcs/ectester/data/EC_Store.java | 23 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/data/schema.xsd | 4 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/data/test/results.xml | 10 |
3 files changed, 26 insertions, 11 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"); diff --git a/src/cz/crcs/ectester/data/schema.xsd b/src/cz/crcs/ectester/data/schema.xsd index 33b9acd..2fe7892 100644 --- a/src/cz/crcs/ectester/data/schema.xsd +++ b/src/cz/crcs/ectester/data/schema.xsd @@ -61,7 +61,11 @@ <xs:simpleType name="kaType"> <xs:restriction base="xs:string"> <xs:enumeration value="DH"/> + <xs:enumeration value="ECDH"/> <xs:enumeration value="DHC"/> + <xs:enumeration value="ECDHC"/> + <xs:enumeration value="BOTH"/> + <xs:enumeration value="ANY"/> </xs:restriction> </xs:simpleType> diff --git a/src/cz/crcs/ectester/data/test/results.xml b/src/cz/crcs/ectester/data/test/results.xml index e382cd4..1146500 100644 --- a/src/cz/crcs/ectester/data/test/results.xml +++ b/src/cz/crcs/ectester/data/test/results.xml @@ -133,7 +133,7 @@ </result> <result> <id>p192-dhc</id> - <ka>DHC</ka> + <ka>ANY</ka> <file>nist/p192-dhc-sha1.csv</file> <curve>nist/P-192</curve> <onekey>test/p192-A</onekey> @@ -141,7 +141,7 @@ </result> <result> <id>p224-dhc</id> - <ka>DHC</ka> + <ka>ANY</ka> <file>nist/p224-dhc-sha1.csv</file> <curve>nist/P-224</curve> <onekey>test/p224-A</onekey> @@ -149,7 +149,7 @@ </result> <result> <id>p256-dhc</id> - <ka>DHC</ka> + <ka>ANY</ka> <file>nist/p256-dhc-sha1.csv</file> <curve>nist/P-256</curve> <onekey>test/p256-A</onekey> @@ -157,7 +157,7 @@ </result> <result> <id>p384-dhc</id> - <ka>DHC</ka> + <ka>ANY</ka> <file>nist/p384-dhc-sha1.csv</file> <curve>nist/P-384</curve> <onekey>test/p384-A</onekey> @@ -165,7 +165,7 @@ </result> <result> <id>p521-dhc</id> - <ka>DHC</ka> + <ka>ANY</ka> <file>nist/p521-dhc-sha1.csv</file> <curve>nist/P-521</curve> <onekey>test/p521-A</onekey> |