Bump BouncyCastle and fix resource loading.

Fixes #18.

8 files changed, 24 insertions, 5 deletions

diff --git a/lib/bcprov-jdk15on-1.58.jar b/lib/bcprov-jdk15on-1.58.jar
deleted file mode 100644
index dae02cb..0000000
--- a/lib/bcprov-jdk15on-1.58.jar
+++ /dev/null
diff --git a/lib/bcprov-jdk18on-172.jar b/lib/bcprov-jdk18on-172.jar
new file mode 100644
index 0000000..fa22e6a
--- /dev/null
+++ b/lib/bcprov-jdk18on-172.jar
diff --git a/nbproject/reader/manifest.mf b/nbproject/reader/manifest.mf
index 521ebdb..bd12067 100644
--- a/nbproject/reader/manifest.mf
+++ b/nbproject/reader/manifest.mf
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Class-Path: lib/bcprov-jdk15on-1.58.jar lib/jcardsim-3.0.5.11.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar
+Class-Path: lib/bcprov-jdk18on-172.jar lib/jcardsim-3.0.5.11.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar
 Main-Class: cz.crcs.ectester.reader.ECTesterReader
 
diff --git a/nbproject/reader/project.properties b/nbproject/reader/project.properties
index ea20d1d..7c99837 100644
--- a/nbproject/reader/project.properties
+++ b/nbproject/reader/project.properties
@@ -33,7 +33,7 @@ excludes=
 includes=**/applet/**,**/common/**,**/data/**,**/reader/**
 jar.compress=true
 javac.classpath=\
-    lib/bcprov-jdk15on-1.58.jar:\
+    lib/bcprov-jdk18on-172.jar:\
     lib/jcardsim-3.0.5.11.jar:\
     lib/commons-cli-1.4.jar:\
     lib/snakeyaml-1.19.jar
diff --git a/nbproject/standalone/manifest.mf b/nbproject/standalone/manifest.mf
index 61e31fe..bf9f1ed 100644
--- a/nbproject/standalone/manifest.mf
+++ b/nbproject/standalone/manifest.mf
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Class-Path: lib/bcprov-jdk15on-1.58.jar lib/wolfcrypt-jni.jar lib/jcardsim-3.0.5.11.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar
+Class-Path: lib/bcprov-jdk18on-172.jar lib/wolfcrypt-jni.jar lib/jcardsim-3.0.5.11.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar
 Main-Class: cz.crcs.ectester.standalone.ECTesterStandalone
 
diff --git a/nbproject/standalone/project.properties b/nbproject/standalone/project.properties
index 1fc1700..22d1726 100644
--- a/nbproject/standalone/project.properties
+++ b/nbproject/standalone/project.properties
@@ -33,7 +33,7 @@ excludes=
 includes=**/common/**,**/standalone/**,**/data/**,**/applet/*
 jar.compress=true
 javac.classpath=\
-    lib/bcprov-jdk15on-1.58.jar:\
+    lib/bcprov-jdk18on-172.jar:\
     lib/wolfcrypt-jni.jar:\
     lib/jcardsim-3.0.5.11.jar:\
     lib/commons-cli-1.4.jar:\
diff --git a/src/cz/crcs/ectester/common/util/Util.java b/src/cz/crcs/ectester/common/util/Util.java
index 3a4912a..5b0cd79 100644
--- a/src/cz/crcs/ectester/common/util/Util.java
+++ b/src/cz/crcs/ectester/common/util/Util.java
@@ -15,4 +15,14 @@ public class Util {
                 return nanos / 1000000;
         }
     }
+
+    public static int getVersion() {
+        String version = System.getProperty("java.version");
+        if(version.startsWith("1.")) {
+            version = version.substring(2, 3);
+        } else {
+            int dot = version.indexOf(".");
+            if(dot != -1) { version = version.substring(0, dot); }
+        } return Integer.parseInt(version);
+    }
 }
diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java
index d104fa4..bcadf80 100644
--- a/src/cz/crcs/ectester/data/EC_Store.java
+++ b/src/cz/crcs/ectester/data/EC_Store.java
@@ -1,6 +1,7 @@
 package cz.crcs.ectester.data;
 
 import cz.crcs.ectester.common.ec.*;
+import cz.crcs.ectester.common.util.Util;
 import javacard.security.KeyPair;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -71,7 +72,15 @@ public class EC_Store {
                 public InputSource resolveEntity(String name, String publicId, String baseURI, String systemId) throws SAXException, IOException {
                     InputSource is = new InputSource();
                     is.setSystemId(systemId);
-                    is.setByteStream(getClass().getClass().getResourceAsStream("/cz/crcs/ectester/data/" + systemId));
+
+                    InputStream bs;
+                    // TODO: Figure out if this is correct for the older Java versions or also wrong.
+                    if (Util.getVersion() <= 8) {
+                        bs = getClass().getClass().getResourceAsStream("/cz/crcs/ectester/data/" + systemId);
+                    } else {
+                        bs = getClass().getResourceAsStream("/cz/crcs/ectester/data/" + systemId);
+                    }
+                    is.setByteStream(bs);
                     return is;
                 }