Refactored EC_Params, renamed EC_Data, added first test vectors.

9 files changed, 35 insertions, 5 deletions

diff --git a/src/cz/crcs/ectester/data/EC_Data.java b/src/cz/crcs/ectester/data/EC_Store.java
index 98b2d59..60a1065 100644
--- a/src/cz/crcs/ectester/data/EC_Data.java
+++ b/src/cz/crcs/ectester/data/EC_Store.java
@@ -29,13 +29,13 @@ import java.util.Map;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class EC_Data {
+public class EC_Store {
 
     private DocumentBuilder db;
 
     private Map<String, EC_Category> categories;
 
-    public EC_Data() {
+    public EC_Store() {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 
         try {
@@ -49,17 +49,17 @@ public class EC_Data {
             db.setErrorHandler(new ErrorHandler() {
                 @Override
                 public void warning(SAXParseException exception) throws SAXException {
-                    System.err.println("EC_Data | Warning : " + exception);
+                    System.err.println("EC_Store | Warning : " + exception);
                 }
 
                 @Override
                 public void error(SAXParseException exception) throws SAXException {
-                    System.err.println("EC_Data | Error : " + exception);
+                    System.err.println("EC_Store | Error : " + exception);
                 }
 
                 @Override
                 public void fatalError(SAXParseException exception) throws SAXException {
-                    System.err.println("EC_Data | Fatal : " + exception);
+                    System.err.println("EC_Store | Fatal : " + exception);
                 }
             });
 
diff --git a/src/cz/crcs/ectester/data/categories.xml b/src/cz/crcs/ectester/data/categories.xml
index 5913d42..d0c9f39 100644
--- a/src/cz/crcs/ectester/data/categories.xml
+++ b/src/cz/crcs/ectester/data/categories.xml
@@ -31,4 +31,9 @@
         <directory>wrong</directory>
         <desc>Wrong field curves. These should definitely give an error when used. Since the "prime" used for the field are not prime, and the field polynomials are also not irreducible. Simply put these parameters don't specify a valid elliptic curve.</desc>
     </category>
+    <category>
+        <name>test</name>
+        <directory>test</directory>
+        <desc>Test vectors</desc>
+    </category>
 </categories>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/invalid/curves.xml b/src/cz/crcs/ectester/data/invalid/curves.xml
new file mode 100644
index 0000000..e87269f
--- /dev/null
+++ b/src/cz/crcs/ectester/data/invalid/curves.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<curves xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../schema.xsd">
+</curves>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/test/keys.xml b/src/cz/crcs/ectester/data/test/keys.xml
new file mode 100644
index 0000000..56fc4e2
--- /dev/null
+++ b/src/cz/crcs/ectester/data/test/keys.xml
@@ -0,0 +1,16 @@
+<?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">
+    <keypair>
+        <id>secp160r1-U</id>
+        <file>secg/secp160r1-keyU.csv</file>
+        <curve>secg/secp160r1</curve>
+    </keypair>
+    <keypair>
+        <id>secp160r1-V</id>
+        <file>secg/secp160r1-keyV.csv</file>
+        <curve>secg/secp160r1</curve>
+    </keypair>
+</keys>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-kdf.csv b/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-kdf.csv
new file mode 100644
index 0000000..e8060e1
--- /dev/null
+++ b/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-kdf.csv
@@ -0,0 +1 @@
+744AB703F5BC082E59185F6D049D2D367DB245C2
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-raw.csv b/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-raw.csv
new file mode 100644
index 0000000..3eac8d9
--- /dev/null
+++ b/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-raw.csv
@@ -0,0 +1 @@
+CA7C0F8C3FFA87A96E1B74AC8E6AF594347BB40A
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-sha1.csv b/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-sha1.csv
new file mode 100644
index 0000000..97735e7
--- /dev/null
+++ b/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-sha1.csv
@@ -0,0 +1 @@
+D248313E865A1AE677782B54B24D8ABAF11A53C2
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-keyU.csv b/src/cz/crcs/ectester/data/test/secg/secp160r1-keyU.csv
new file mode 100644
index 0000000..bbf9e62
--- /dev/null
+++ b/src/cz/crcs/ectester/data/test/secg/secp160r1-keyU.csv
@@ -0,0 +1 @@
+51B4496FECC406ED0E75A24A3C03206251419DC0,C28DCB4B73A514B468D793894F381CCC1756AA6C,AA374FFC3CE144E6B073307972CB6D57B2A4E982
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-keyV.csv b/src/cz/crcs/ectester/data/test/secg/secp160r1-keyV.csv
new file mode 100644
index 0000000..6d9bc31
--- /dev/null
+++ b/src/cz/crcs/ectester/data/test/secg/secp160r1-keyV.csv
@@ -0,0 +1 @@
+49B41E0E9C0369C2328739D90F63D56707C6E5BC,26E008B567015ED96D232A03111C3EDC0E9C8F83,45FB58A92A17AD4B15101C66E74F277E2B460866