Add various ECDSA tests.

2 files changed, 43 insertions, 45 deletions

diff --git a/src/cz/crcs/ectester/data/test/keys.xml b/src/cz/crcs/ectester/data/test/keys.xml
index 5f86b5b..380aef1 100644
--- a/src/cz/crcs/ectester/data/test/keys.xml
+++ b/src/cz/crcs/ectester/data/test/keys.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <keys xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="../schema.xsd"
-      category="test"
-      desc="Test vectors">
+      xsi:noNamespaceSchemaLocation="../schema.xsd">
     <keypair>
         <id>secp160r1-U</id>
         <file>secg/secp160r1-keyU.csv</file>
diff --git a/src/cz/crcs/ectester/data/test/results.xml b/src/cz/crcs/ectester/data/test/results.xml
index 1146500..64fa86a 100644
--- a/src/cz/crcs/ectester/data/test/results.xml
+++ b/src/cz/crcs/ectester/data/test/results.xml
@@ -1,174 +1,174 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../schema.xsd">
-    <result>
+    <kaResult>
         <id>secp160r1-dh</id>
         <ka>DH</ka>
         <file>secg/secp160r1-dh-sha1.csv</file>
         <curve>secg/secp160r1</curve>
         <onekey>test/secp160r1-U</onekey>
         <otherkey>test/secp160r1-V</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>sect163k1-dh</id>
         <ka>DH</ka>
         <file>secg/sect163k1-dh-sha1.csv</file>
         <curve>secg/sect163k1</curve>
         <onekey>test/sect163k1-U</onekey>
         <otherkey>test/sect163k1-V</otherkey>
-    </result>
+    </kaResult>
 
-    <result>
+    <kaResult>
         <id>brainpoolP224r1-dh</id>
         <ka>DH</ka>
         <file>brainpool/brainpoolP224r1-dh-sha1.csv</file>
         <curve>brainpool/brainpoolP224r1</curve>
         <onekey>test/brainpoolP224r1-A</onekey>
         <otherkey>test/brainpoolP224r1-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>brainpoolP256r1-dh</id>
         <ka>DH</ka>
         <file>brainpool/brainpoolP256r1-dh-sha1.csv</file>
         <curve>brainpool/brainpoolP256r1</curve>
         <onekey>test/brainpoolP256r1-A</onekey>
         <otherkey>test/brainpoolP256r1-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>brainpoolP384r1-dh</id>
         <ka>DH</ka>
         <file>brainpool/brainpoolP384r1-dh-sha1.csv</file>
         <curve>brainpool/brainpoolP384r1</curve>
         <onekey>test/brainpoolP384r1-A</onekey>
         <otherkey>test/brainpoolP384r1-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>brainpoolP512r1-dh</id>
         <ka>DH</ka>
         <file>brainpool/brainpoolP512r1-dh-sha1.csv</file>
         <curve>brainpool/brainpoolP512r1</curve>
         <onekey>test/brainpoolP512r1-A</onekey>
         <otherkey>test/brainpoolP512r1-B</otherkey>
-    </result>
+    </kaResult>
 
-    <result>
+    <kaResult>
         <id>b163-dhc</id>
         <ka>DHC</ka>
         <file>nist/b163-dhc-sha1.csv</file>
         <curve>nist/B-163</curve>
         <onekey>test/b163-A</onekey>
         <otherkey>test/b163-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>b233-dhc</id>
         <ka>DHC</ka>
         <file>nist/b233-dhc-sha1.csv</file>
         <curve>nist/B-233</curve>
         <onekey>test/b233-A</onekey>
         <otherkey>test/b233-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>b283-dhc</id>
         <ka>DHC</ka>
         <file>nist/b283-dhc-sha1.csv</file>
         <curve>nist/B-283</curve>
         <onekey>test/b283-A</onekey>
         <otherkey>test/b283-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>b409-dhc</id>
         <ka>DHC</ka>
         <file>nist/b409-dhc-sha1.csv</file>
         <curve>nist/B-409</curve>
         <onekey>test/b409-A</onekey>
         <otherkey>test/b409-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>b571-dhc</id>
         <ka>DHC</ka>
         <file>nist/b571-dhc-sha1.csv</file>
         <curve>nist/B-571</curve>
         <onekey>test/b571-A</onekey>
         <otherkey>test/b571-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>k163-dhc</id>
         <ka>DHC</ka>
         <file>nist/k163-dhc-sha1.csv</file>
         <curve>nist/B-163</curve>
         <onekey>test/k163-A</onekey>
         <otherkey>test/k163-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>k233-dhc</id>
         <ka>DHC</ka>
         <file>nist/k233-dhc-sha1.csv</file>
         <curve>nist/B-233</curve>
         <onekey>test/k233-A</onekey>
         <otherkey>test/k233-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>k283-dhc</id>
         <ka>DHC</ka>
         <file>nist/k283-dhc-sha1.csv</file>
         <curve>nist/B-283</curve>
         <onekey>test/k283-A</onekey>
         <otherkey>test/k283-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>k409-dhc</id>
         <ka>DHC</ka>
         <file>nist/k409-dhc-sha1.csv</file>
         <curve>nist/B-409</curve>
         <onekey>test/k409-A</onekey>
         <otherkey>test/k409-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>k571-dhc</id>
         <ka>DHC</ka>
         <file>nist/k571-dhc-sha1.csv</file>
         <curve>nist/B-571</curve>
         <onekey>test/k571-A</onekey>
         <otherkey>test/k571-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>p192-dhc</id>
         <ka>ANY</ka>
         <file>nist/p192-dhc-sha1.csv</file>
         <curve>nist/P-192</curve>
         <onekey>test/p192-A</onekey>
         <otherkey>test/p192-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>p224-dhc</id>
         <ka>ANY</ka>
         <file>nist/p224-dhc-sha1.csv</file>
         <curve>nist/P-224</curve>
         <onekey>test/p224-A</onekey>
         <otherkey>test/p224-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>p256-dhc</id>
         <ka>ANY</ka>
         <file>nist/p256-dhc-sha1.csv</file>
         <curve>nist/P-256</curve>
         <onekey>test/p256-A</onekey>
         <otherkey>test/p256-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>p384-dhc</id>
         <ka>ANY</ka>
         <file>nist/p384-dhc-sha1.csv</file>
         <curve>nist/P-384</curve>
         <onekey>test/p384-A</onekey>
         <otherkey>test/p384-B</otherkey>
-    </result>
-    <result>
+    </kaResult>
+    <kaResult>
         <id>p521-dhc</id>
         <ka>ANY</ka>
         <file>nist/p521-dhc-sha1.csv</file>
         <curve>nist/P-521</curve>
         <onekey>test/p521-A</onekey>
         <otherkey>test/p521-B</otherkey>
-    </result>
+    </kaResult>
 </results>
\ No newline at end of file