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
commit 5d2b853273b4e787a7f0fe4848b41094f2d60d2b Author: Sebb <s...@apache.org> AuthorDate: Tue Oct 31 22:46:21 2023 +0000 Show details of crypt library actually loaded [skip ci] --- src/main/java/org/apache/commons/crypto/Crypto.java | 1 + src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java | 1 + src/test/java/org/apache/commons/crypto/CryptoTest.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/crypto/Crypto.java b/src/main/java/org/apache/commons/crypto/Crypto.java index 4f02106b..fe224bba 100644 --- a/src/main/java/org/apache/commons/crypto/Crypto.java +++ b/src/main/java/org/apache/commons/crypto/Crypto.java @@ -151,6 +151,7 @@ public final class Crypto { */ public static void main(final String[] args) throws Exception { quiet = args.length == 1 && args[0].equals("-q"); + info("jni.library.path=%s", System.getProperty("jni.library.path")); info("%s %s", getComponentName(), getComponentVersion()); if (isNativeCodeLoaded()) { info("Native code loaded OK: %s", OpenSslInfoNative.NativeVersion()); diff --git a/src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java b/src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java index 575c7267..c4d7659b 100644 --- a/src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java +++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslJna.java @@ -96,6 +96,7 @@ public final class OpenSslJna { * @throws Throwable Throws value from {@link #initialisationError()}. */ public static void main(final String[] args) throws Throwable { + info("jna.library.path=%s", System.getProperty("jna.library.path")); info(Crypto.getComponentName() + " OpenSslJna: enabled = %s, version = 0x%08X", isEnabled(), OpenSslNativeJna.VERSION); final Throwable initialisationError = initialisationError(); if (initialisationError != null) { diff --git a/src/test/java/org/apache/commons/crypto/CryptoTest.java b/src/test/java/org/apache/commons/crypto/CryptoTest.java index 42819883..9c1a532e 100644 --- a/src/test/java/org/apache/commons/crypto/CryptoTest.java +++ b/src/test/java/org/apache/commons/crypto/CryptoTest.java @@ -56,7 +56,7 @@ public class CryptoTest { public void testMain() throws Throwable { // Check that Crypto.main will actually run tests assertTrue(Crypto.isNativeCodeLoaded(), "Native code loaded OK"); - Crypto.main(new String[] { "-q" }); // output causes issues for testing + Crypto.main(new String[] { }); // show the JNI library details assertTrue(Crypto.isNativeCodeLoaded(), "Completed OK"); }