Separate list of bundled libraries

Author: jasonkatonica

closed/src/java.base/share/native/libjncrypto/NativeCrypto.c

@@ -669,7 +669,20 @@ find_crypto_library(jboolean traceEnabled, const char *chomepath)
 #endif /* defined(_AIX) */
     };
 
+    /** OpenSSL library names associated with bundled library. */
+    static const char * const bundledLibName[] = {
+        #if defined(_AIX)
+                "libcrypto-semeru.so",
+        #elif defined(__APPLE__) /* defined(_AIX) */
+                "libcrypto-semeru.dylib",
+        #elif defined(_WIN32) /* defined(__APPLE__) */
+                "crypto-semeru.dll",
+        #else /* defined(_WIN32) */
+                "libcrypto-semeru.so",
+        #endif /* defined(_AIX) */
+    };
     const size_t numOfLibs = sizeof(libNames) / sizeof(libNames[0]);
+    const size_t bundledNumOfLibs = sizeof(bundledLibName) / sizeof(bundledLibName[0]);
 #if defined(_AIX)
     const size_t num_of_generic = 4;
 #elif defined(__linux__) /* defined(_AIX) */
@@ -710,8 +723,8 @@ find_crypto_library(jboolean traceEnabled, const char *chomepath)
             fprintf(stdout, "Attempting to load library bundled with JDK from: %s\n", libPath);
         }
 
-        for (i = 0; i < numOfLibs; i++) {
-            size_t file_len = strlen(libNames[i]);
+        for (i = 0; i < bundledNumOfLibs; i++) {
+            size_t file_len = strlen(bundledLibName[i]);
             /* Allocate memory for the new file name with the path. */
             char *libNameWithPath = (char *)malloc(path_len + file_len + 1);
 
@@ -723,11 +736,11 @@ find_crypto_library(jboolean traceEnabled, const char *chomepath)
             }
 
             strcpy(libNameWithPath, libPath);
-            strcat(libNameWithPath, libNames[i]);
+            strcat(libNameWithPath, bundledNumOfLibs[i]);
 
             /* Load OpenSSL Crypto library bundled with JDK. */
             if (traceEnabled) {
-                fprintf(stdout, "\tAttempting to load: %s\n", libNames[i]);
+                fprintf(stdout, "\tAttempting to load: %s\n", bundledNumOfLibs[i]);
             }
             result = load_crypto_library(traceEnabled, libNameWithPath);