Added nist and brainpool test vectors, also smallpub test

1 files changed, 4 insertions, 3 deletions

diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java
index c32f1ce..aec635e 100644
--- a/src/cz/crcs/ectester/data/EC_Store.java
+++ b/src/cz/crcs/ectester/data/EC_Store.java
@@ -179,7 +179,7 @@ public class EC_Store {
         return new EC_Category(name, dir, desc, objMap);
     }
 
-    private EC_Params parseKeylike(String dir, Element elem) throws SAXException {
+    private EC_Params parseKeylike(String dir, Element elem) throws SAXException, IOException {
         Node file = elem.getElementsByTagName("file").item(0);
         Node curve = elem.getElementsByTagName("curve").item(0);
 
@@ -199,7 +199,9 @@ public class EC_Store {
         } else {
             throw new SAXException("?");
         }
-        result.readCSV(this.getClass().getResourceAsStream("/cz/crcs/ectester/data/" + dir + "/" + file.getTextContent()));
+        if(!result.readCSV(this.getClass().getResourceAsStream("/cz/crcs/ectester/data/" + dir + "/" + file.getTextContent()))) {
+            throw new IOException("Invalid CSV data.");
+        }
         return result;
     }
 
@@ -243,5 +245,4 @@ public class EC_Store {
         return getObject(objClass, parts[0], parts[1]);
     }
 
-
 }