From 9c2b3c836bddddd9486d7ed74b5a95af683ff83e Mon Sep 17 00:00:00 2001
From: J08nY
Date: Fri, 21 Jun 2024 14:23:31 +0200
Subject: Always write shims to shim directory, do not check for freshness.

---
 .../src/main/java/cz/crcs/ectester/common/util/FileUtil.java  | 11 +++++++++++
 ext/boringssl                                                 |  2 +-
 .../java/cz/crcs/ectester/standalone/ECTesterStandalone.java  |  6 +++---
 .../cz/crcs/ectester/standalone/libs/NativeECLibrary.java     |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java b/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
index e6e319b..da682b6 100644
--- a/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
@@ -81,6 +81,17 @@ public class FileUtil {
         return true;
     }
 
+    public static boolean write(String resourcePath, Path outPath) throws IOException {
+        URL reqURL = FileUtil.class.getResource(resourcePath);
+        if (reqURL == null) {
+            return false;
+        }
+        URLConnection reqConn = reqURL.openConnection();
+        Files.copy(reqConn.getInputStream(), outPath, StandardCopyOption.REPLACE_EXISTING);
+        reqConn.getInputStream().close();
+        return true;
+    }
+
     public static Path getLibDir() {
         return getAppData().resolve("ECTesterStandalone");
     }
diff --git a/ext/boringssl b/ext/boringssl
index 80a243e..67422ed 160000
--- a/ext/boringssl
+++ b/ext/boringssl
@@ -1 +1 @@
-Subproject commit 80a243e07ef77156af66efa7d22ac35aba44c1b3
+Subproject commit 67422ed4434116daa8898773692165ddd51a6ac2
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 2b9a853..10e95ca 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -103,12 +103,12 @@ public class ECTesterStandalone {
             reqs.toFile().mkdirs();
 
             if (!System.getProperty("os.name").startsWith("Windows")) {
-                FileUtil.writeNewer(LIB_RESOURCE_DIR + "lib_timing.so", reqs.resolve("lib_timing.so"));
+                FileUtil.write(LIB_RESOURCE_DIR + "lib_timing.so", reqs.resolve("lib_timing.so"));
                 System.load(reqs.resolve("lib_timing.so").toString());
 
-                FileUtil.writeNewer(LIB_RESOURCE_DIR + "lib_csignals.so", reqs.resolve("lib_csignals.so"));
+                FileUtil.write(LIB_RESOURCE_DIR + "lib_csignals.so", reqs.resolve("lib_csignals.so"));
                 System.load(reqs.resolve("lib_csignals.so").toString());
-                FileUtil.writeNewer(LIB_RESOURCE_DIR + "lib_cppsignals.so", reqs.resolve("lib_cppsignals.so"));
+                FileUtil.write(LIB_RESOURCE_DIR + "lib_cppsignals.so", reqs.resolve("lib_cppsignals.so"));
                 System.load(reqs.resolve("lib_cppsignals.so").toString());
             }
 
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 7f9d96e..c11dbdb 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
@@ -33,7 +33,7 @@ public abstract class NativeECLibrary extends ProviderECLibrary {
             Path libPath = libDir.resolve(resource + "." + suffix);
 
             /* Write the shim. */
-            boolean found = FileUtil.writeNewer(ECTesterStandalone.LIB_RESOURCE_DIR + resource + "." + suffix, libPath);
+            boolean found = FileUtil.write(ECTesterStandalone.LIB_RESOURCE_DIR + resource + "." + suffix, libPath);
             if (!found) {
                 return false;
             }
@@ -44,7 +44,7 @@ public abstract class NativeECLibrary extends ProviderECLibrary {
                     if (requirement.endsWith(suffix)) {
                         /* The requirement is bundled, write it */
                         Path reqPath = libReqDir.resolve(requirement);
-                        found = FileUtil.writeNewer(ECTesterStandalone.LIB_RESOURCE_DIR + requirement, reqPath);
+                        found = FileUtil.write(ECTesterStandalone.LIB_RESOURCE_DIR + requirement, reqPath);
                         if (!found) {
                             return false;
                         }
-- 
cgit v1.3.1