From b3d981496d9a6869fc10d160670a51cb91a5ef94 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Mon, 30 Jan 2023 17:59:56 +0100
Subject: Bump BouncyCastle and fix resource loading.

Fixes #18.
---
 src/cz/crcs/ectester/data/EC_Store.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/cz/crcs/ectester/data/EC_Store.java')

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;
                 }
 
-- 
cgit v1.2.3-70-g09d2