Merge pull request #429 from KostasTsiounis/ossl_load

Consistently load OpenSSL libraries among different platforms
ibmruntimes · Jan 24, 2025 · 49a6d91 · 49a6d91
2 parents 7c0800a + e8b4ac9
commit 49a6d91
Show file tree

Hide file tree

Showing 7 changed files with 467 additions and 402 deletions.
diff --git a/closed/src/java.base/aix/native/libjncrypto/NativeCrypto_md.c b/closed/src/java.base/aix/native/libjncrypto/NativeCrypto_md.c
diff --git a/closed/src/java.base/macosx/native/libjncrypto/NativeCrypto_md.c b/closed/src/java.base/macosx/native/libjncrypto/NativeCrypto_md.c
diff --git a/closed/src/java.base/share/classes/jdk/crypto/jniprovider/NativeCrypto.java b/closed/src/java.base/share/classes/jdk/crypto/jniprovider/NativeCrypto.java
@@ -1,6 +1,6 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2018, 2024 All Rights Reserved
+ * (c) Copyright IBM Corp. 2018, 2025 All Rights Reserved
  * ===========================================================================
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 import jdk.internal.ref.CleanerFactory;
 import jdk.internal.reflect.Reflection;
 import jdk.internal.reflect.CallerSensitive;
+import jdk.internal.util.StaticProperty;
 
 import sun.security.action.GetPropertyAction;
 
@@ -81,24 +82,39 @@ private static final class InstanceHolder {
 
     private final boolean isOpenSSLFIPS;
 
+    @SuppressWarnings("restricted")
     private static long loadCryptoLibraries() {
         long osslVersion;
 
         try {
-            // load jncrypto JNI library
+            // Load jncrypto JNI library.
             System.loadLibrary("jncrypto");
-            // load OpenSSL crypto library dynamically
-            osslVersion = loadCrypto(traceEnabled);
-            if (traceEnabled && (osslVersion != -1)) {
-                System.err.println("Native crypto library load succeeded - using native crypto library.");
+
+            // Get user-specified OpenSSL library to use, if available.
+            String nativeLibName =
+                    GetPropertyAction.privilegedGetProperty("jdk.native.openssl.lib", "");
+
+            // Get the JDK location.
+            String javaHome = StaticProperty.javaHome();
+
+            // Load OpenSSL crypto library dynamically.
+            osslVersion = loadCrypto(traceEnabled, nativeLibName, javaHome);
+            if (osslVersion != -1) {
+                if (traceEnabled) {
+                    System.err.println("Native crypto library load succeeded - using native crypto library.");
+                }
+            } else {
+                if (!nativeLibName.isEmpty()) {
+                    throw new RuntimeException(nativeLibName + " is not available, crypto libraries are not loaded");
+                }
             }
         } catch (UnsatisfiedLinkError usle) {
             if (traceEnabled) {
                 System.err.println("UnsatisfiedLinkError: Failure attempting to load jncrypto JNI library");
                 System.err.println("Warning: Native crypto library load failed." +
                         " Using Java crypto implementation.");
             }
-            // signal load failure
+            // Signal load failure.
             osslVersion = -1;
         }
         return osslVersion;
@@ -253,14 +269,18 @@ public void run() {
         });
     }
 
-    /* Native digest interfaces */
+    /* OpenSSL utility interfaces */
 
-    private static final native long loadCrypto(boolean trace);
+    private static final native long loadCrypto(boolean trace,
+                                                String libName,
+                                                String javaHome);
 
     public static final native boolean isMD5Available();
 
     private static final native boolean isOpenSSLFIPS();
 
+    /* Native digest interfaces */
+
     public final native long DigestCreateContext(long nativeBuffer,
                                                  int algoIndex);