Address comments 2

KostasTsiounis · Nov 1, 2024 · fb51d77 · fb51d77
1 parent 899c1d8
commit fb51d77
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
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
@@ -207,12 +207,13 @@ public static final boolean isAlgorithmAvailable(String algorithm) {
                 if (disallowedAlgosFIPS.contains(algorithm)) {
                     isAlgorithmAvailable = false;
                 }
-            }
-            switch (algorithm) {
-                case "MD5":
-                    isAlgorithmAvailable = isMD5Available();
-                default:
-                    isAlgorithmAvailable = true;
+            } else {
+                switch (algorithm) {
+                    case "MD5":
+                        isAlgorithmAvailable = isMD5Available();
+                    default:
+                        isAlgorithmAvailable = true;
+                }
             }
         }
 

diff --git a/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c b/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c
@@ -458,16 +458,16 @@ JNIEXPORT jlong JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_loadCrypto
     /* Check whether the loaded OpenSSL library is in FIPS mode. */
     if (ossl_ver >= OPENSSL_VERSION_3_0_0) {
         typedef int OSSL_fipsmode_t(OSSL_LIB_CTX *);
-        OSSL_fipsmode_t* OSSL_fipsmode = (OSSL_fipsmode_t*)find_crypto_symbol(crypto_library, "EVP_default_properties_is_fips_enabled");
-        if ((NULL != OSSL_fipsmode) && (1 == (*OSSL_fipsmode)(NULL))) {
+        OSSL_fipsmode_t* ossl_fipsmode = (OSSL_fipsmode_t*)find_crypto_symbol(crypto_library, "EVP_default_properties_is_fips_enabled");
+        if ((NULL != ossl_fipsmode) && (1 == (*ossl_fipsmode)(NULL))) {
             OSSL_IS_FIPS = JNI_TRUE;
         } else {
             OSSL_IS_FIPS = JNI_FALSE;
         }
     } else {
         typedef int OSSL_fipsmode_t(void);
-        OSSL_fipsmode_t* OSSL_fipsmode = (OSSL_fipsmode_t*)find_crypto_symbol(crypto_library, "FIPS_mode");
-        if ((NULL != OSSL_fipsmode) && (1 == (*OSSL_fipsmode)())) {
+        OSSL_fipsmode_t* ossl_fipsmode = (OSSL_fipsmode_t*)find_crypto_symbol(crypto_library, "FIPS_mode");
+        if ((NULL != ossl_fipsmode) && (1 == (*ossl_fipsmode)())) {
             OSSL_IS_FIPS = JNI_TRUE;
         } else {
             OSSL_IS_FIPS = JNI_FALSE;