2 files changed, 17 insertions, 3 deletions
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
index 57ab98f..cfdb964 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -839,9 +839,13 @@ public class ECTesterStandalone {
         KeyPair kp = kpg.genKeyPair();
         ECPrivateKey privateKey = (ECPrivateKey) kp.getPrivate();
         ECParameterSpec params = privateKey.getParams();
-        System.out.println(params);
-        EC_Curve curve = EC_Curve.fromSpec(params);
-        curve.writeCSV(System.out);
+        if (params == null) {
+            System.err.println("Parameters could not be exported (they are NULL).");
+        } else {
+            System.out.println(params);
+            EC_Curve curve = EC_Curve.fromSpec(params);
+            curve.writeCSV(System.out);
+        }
     }
 
     public static void main(String[] args) {
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/WolfCryptLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/WolfCryptLib.java
index b58eb91..ff592d1 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/WolfCryptLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/WolfCryptLib.java
@@ -12,6 +12,16 @@ public class WolfCryptLib extends ProviderECLibrary {
     }
 
     @Override
+    public boolean initialize() {
+        try {
+            System.loadLibrary("wolfcryptjni");
+            return super.initialize();
+        } catch (UnsatisfiedLinkError ule) {
+            return false;
+        }
+    }
+
+    @Override
     public Set<String> getCurves() {
         return new HashSet<>();
     }