(commons-crypto) branch master updated: Show more info on failure

[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 444f98b2 Show more info on failure
444f98b2 is described below

commit 444f98b2cebf8f2ddd8a32a916e88e388914c282
Author: Sebb <s...@apache.org>
AuthorDate: Tue Nov 14 14:40:37 2023 +0000

    Show more info on failure
---
 .../java/org/apache/commons/crypto/Crypto.java     | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/commons/crypto/Crypto.java 
b/src/main/java/org/apache/commons/crypto/Crypto.java
index f510738b..3a912a0a 100644
--- a/src/main/java/org/apache/commons/crypto/Crypto.java
+++ b/src/main/java/org/apache/commons/crypto/Crypto.java
@@ -163,26 +163,30 @@ public final class Crypto {
             info("OpenSSL library info: %s", 
OpenSslInfoNative.OpenSSLVersion(0));
             info("DLL name: %s", OpenSslInfoNative.DLLName());
             info("DLL path: %s", OpenSslInfoNative.DLLPath());
-            { // CryptoRandom
+            info("Additional OpenSSL_version(n) details:");
+            for (int j = 1; j < Utils.OPENSSL_VERSION_MAX_INDEX; j++) { // 
entry 0 is shown above
+                String data = OpenSslInfoNative.OpenSSLVersion(j);
+                if (!"not available".equals(data)) {
+                    info("OpenSSLVersion(%d): %s", j, data);
+                }
+            }
+            try { // CryptoRandom
                 final Properties props = new Properties();
                 props.setProperty(CryptoRandomFactory.CLASSES_KEY, 
CryptoRandomFactory.RandomProvider.OPENSSL.getClassName());
                 try (CryptoRandom cryptoRandom = 
CryptoRandomFactory.getCryptoRandom(props)) {
                     info("Random instance created OK: %s", cryptoRandom);
                 }
+            } catch (Exception e) {
+                info("Failed: %s", e);
             }
-            { // CryptoCipher
+            try { // CryptoCipher
                 final Properties props = new Properties();
                 props.setProperty(CryptoCipherFactory.CLASSES_KEY, 
CryptoCipherFactory.CipherProvider.OPENSSL.getClassName());
                 try (CryptoCipher cryptoCipher = 
CryptoCipherFactory.getCryptoCipher(AES.CTR_NO_PADDING, props)) {
                     info("Cipher %s instance created OK: %s", 
AES.CTR_NO_PADDING, cryptoCipher);
                 }
-            }
-            info("Additional OpenSSL_version(n) details:");
-            for (int j = 1; j < Utils.OPENSSL_VERSION_MAX_INDEX; j++) { // 
entry 0 is shown above
-                String data = OpenSslInfoNative.OpenSSLVersion(j);
-                if (!"not available".equals(data)) {
-                    info("OpenSSLVersion(%d): %s", j, data);
-                }
+            } catch (Exception e) {
+                info("Failed: %s", e);
             }
         } else {
             Throwable error = getLoadingError();