[commons-crypto] branch master updated: Must use same library name for all 3 classes

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git


The following commit(s) were added to refs/heads/master by this push:
     new 46c7441  Must use same library name for all 3 classes
46c7441 is described below

commit 46c7441c07e913f0b9f6b926f24016199b5d95b1
Author: Sebb <s...@apache.org>
AuthorDate: Tue Jun 28 23:40:22 2022 +0100

    Must use same library name for all 3 classes
    
    Otherwise need to define at least two properties for a
    successful override (controller and 10X or 11X versions)
---
 .../java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java   | 3 +--
 .../java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java   | 3 +--
 src/main/java/org/apache/commons/crypto/jna/OpenSslNativeJna.java | 8 +++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java 
b/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
index e8ab05f..7b7c239 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
@@ -36,8 +36,7 @@ class OpenSsl10XNativeJna {
         boolean ok = false;
         Throwable thrown = null;
         try {
-            final String libName = System.getProperty(Crypto.CONF_PREFIX + 
OpenSsl10XNativeJna.class.getSimpleName(),
-                    "crypto");
+            final String libName = OpenSslNativeJna.LIBRARY_NAME;
             OpenSslJna.debug("Native.register('%s')%n", libName);
             Native.register(libName);
             ok = true;
diff --git 
a/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java 
b/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
index 1c81235..fbd1ea9 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
@@ -36,8 +36,7 @@ class OpenSsl11XNativeJna {
         boolean ok = false;
         Throwable thrown = null;
         try {
-            final String libName = System.getProperty(Crypto.CONF_PREFIX + 
OpenSsl11XNativeJna.class.getSimpleName(),
-                    "crypto");
+            final String libName = OpenSslNativeJna.LIBRARY_NAME;
             OpenSslJna.debug("Native.register('%s')%n", libName);
             Native.register(libName);
             ok = true;
diff --git a/src/main/java/org/apache/commons/crypto/jna/OpenSslNativeJna.java 
b/src/main/java/org/apache/commons/crypto/jna/OpenSslNativeJna.java
index e9fbd04..75acca9 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSslNativeJna.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslNativeJna.java
@@ -42,10 +42,12 @@ class OpenSslNativeJna {
     public static final long VERSION_1_0_X = 0x10000000;
     public static final long VERSION_1_1_X = 0x10100000;
 
+    // The same library name is also needed by OpenSsl10XNativeJna and 
OpenSsl11XNativeJna 
+    static final String LIBRARY_NAME = System.getProperty(Crypto.CONF_PREFIX + 
OpenSslNativeJna.class.getSimpleName(), "crypto");
+
     static {
-        final String libraryName = System.getProperty(Crypto.CONF_PREFIX + 
OpenSslNativeJna.class.getSimpleName(), "crypto");
-        OpenSslJna.debug("NativeLibrary.getInstance('%s')%n", libraryName);
-        final NativeLibrary crypto = NativeLibrary.getInstance(libraryName);
+        OpenSslJna.debug("NativeLibrary.getInstance('%s')%n", LIBRARY_NAME);
+        final NativeLibrary crypto = NativeLibrary.getInstance(LIBRARY_NAME);
         Function version = null;
         try {
             version = crypto.getFunction("SSLeay");