From 209a4f83eb43fa20a0f95f957a824a67d02c0214 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Fri, 16 Aug 2024 00:41:04 +0200
Subject: Attempt to fix submodule build.

---
 .../ectester/standalone/libs/BoringsslLib.java     |  2 +-
 .../cz/crcs/ectester/standalone/libs/IppcpLib.java |  2 +-
 .../crcs/ectester/standalone/libs/LibresslLib.java |  2 +-
 .../crcs/ectester/standalone/libs/MbedTLSLib.java  |  2 +-
 .../ectester/standalone/libs/NativeECLibrary.java  | 24 ++++++----------------
 5 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'standalone/src/main/java/cz')

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
index 5d30d81..06e6b4a 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
@@ -8,7 +8,7 @@ import java.util.Set;
  */
 public class BoringsslLib extends NativeECLibrary {
     public BoringsslLib() {
-        super("BoringSSL", "boringssl_provider");
+        super("BoringSSL", "boringssl_provider", "lib_boringssl.so");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/IppcpLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/IppcpLib.java
index a1c58ce..fa51585 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/IppcpLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/IppcpLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class IppcpLib extends NativeECLibrary {
 
     public IppcpLib() {
-        super("IPPCP", "ippcp_provider");
+        super("IPPCP", "ippcp_provider", "lib_ippcp.so");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
index 0911119..e53399c 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
@@ -8,7 +8,7 @@ import java.util.Set;
  */
 public class LibresslLib extends NativeECLibrary {
     public LibresslLib() {
-        super("LibreSSL", "libressl_provider");
+        super("LibreSSL", "libressl_provider", "lib_libressl.so");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MbedTLSLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MbedTLSLib.java
index 038dbe8..efc8cad 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MbedTLSLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MbedTLSLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class MbedTLSLib extends NativeECLibrary {
 
     public MbedTLSLib() {
-        super("mbedTLS", "mbedtls_provider");
+        super("mbedTLS", "mbedtls_provider", "lib_mbedtls.so");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java
index fb4e430..210a6e9 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java
@@ -38,25 +38,13 @@ public abstract class NativeECLibrary extends ProviderECLibrary {
                 return false;
             }
 
-            /* Load the requirements, if they are bundled, write them in and load them. */
-            try {
-                for (String requirement : requriements) {
-                    if (requirement.endsWith(suffix)) {
-                        /* The requirement is bundled, write it */
-                        Path reqPath = libReqDir.resolve(requirement);
-                        found = FileUtil.write(ECTesterStandalone.LIB_RESOURCE_DIR + requirement, reqPath);
-                        if (!found) {
-                            return false;
-                        }
-                        System.load(reqPath.toString());
-                    } else {
-                        System.loadLibrary(requirement);
-                    }
+            /* Load the requirements, if they are bundled, write them in. */
+            for (String requirement : requriements) {
+                if (requirement.endsWith(suffix)) {
+                    /* The requirement is bundled, write it */
+                    Path reqPath = libReqDir.resolve(requirement);
+                    FileUtil.write(ECTesterStandalone.LIB_RESOURCE_DIR + requirement, reqPath);
                 }
-            } catch (UnsatisfiedLinkError ule) {
-                System.err.println(resource);
-                ule.printStackTrace();
-                return false;
             }
 
             System.load(libPath.toString());
-- 
cgit v1.2.3-70-g09d2