70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
|
commit 90e344e7d4987af610fa0054c92d18fe1c2edd41
|
||
|
|
Author: Andrew Hughes <gnu.andrew@redhat.com>
|
||
|
|
Date: Sat Aug 28 01:15:28 2021 +0100
|
||
|
|
|
||
|
|
RH1929465: Don't define unused throwIOException function when using NSS detection
|
||
|
|
|
||
|
|
diff --git openjdk.orig/src/java.base/linux/native/libsystemconf/systemconf.c openjdk/src/java.base/linux/native/libsystemconf/systemconf.c
|
||
|
|
index 6f4656bfcb6..38919d6bb0f 100644
|
||
|
|
--- openjdk.orig/src/java.base/linux/native/libsystemconf/systemconf.c
|
||
|
|
+++ openjdk/src/java.base/linux/native/libsystemconf/systemconf.c
|
||
|
|
@@ -34,14 +34,34 @@
|
||
|
|
|
||
|
|
#include "java_security_SystemConfigurator.h"
|
||
|
|
|
||
|
|
-#define FIPS_ENABLED_PATH "/proc/sys/crypto/fips_enabled"
|
||
|
|
#define MSG_MAX_SIZE 96
|
||
|
|
|
||
|
|
static jmethodID debugPrintlnMethodID = NULL;
|
||
|
|
static jobject debugObj = NULL;
|
||
|
|
|
||
|
|
-static void throwIOException(JNIEnv *env, const char *msg);
|
||
|
|
-static void dbgPrint(JNIEnv *env, const char* msg);
|
||
|
|
+// Only used when NSS is unavailable and FIPS_ENABLED_PATH is read
|
||
|
|
+#ifndef SYSCONF_NSS
|
||
|
|
+
|
||
|
|
+#define FIPS_ENABLED_PATH "/proc/sys/crypto/fips_enabled"
|
||
|
|
+
|
||
|
|
+static void throwIOException(JNIEnv *env, const char *msg)
|
||
|
|
+{
|
||
|
|
+ jclass cls = (*env)->FindClass(env, "java/io/IOException");
|
||
|
|
+ if (cls != 0)
|
||
|
|
+ (*env)->ThrowNew(env, cls, msg);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
+static void dbgPrint(JNIEnv *env, const char* msg)
|
||
|
|
+{
|
||
|
|
+ jstring jMsg;
|
||
|
|
+ if (debugObj != NULL) {
|
||
|
|
+ jMsg = (*env)->NewStringUTF(env, msg);
|
||
|
|
+ CHECK_NULL(jMsg);
|
||
|
|
+ (*env)->CallVoidMethod(env, debugObj, debugPrintlnMethodID, jMsg);
|
||
|
|
+ }
|
||
|
|
+}
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Class: java_security_SystemConfigurator
|
||
|
|
@@ -149,20 +169,3 @@ JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEn
|
||
|
|
|
||
|
|
#endif // SYSCONF_NSS
|
||
|
|
}
|
||
|
|
-
|
||
|
|
-static void throwIOException(JNIEnv *env, const char *msg)
|
||
|
|
-{
|
||
|
|
- jclass cls = (*env)->FindClass(env, "java/io/IOException");
|
||
|
|
- if (cls != 0)
|
||
|
|
- (*env)->ThrowNew(env, cls, msg);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-static void dbgPrint(JNIEnv *env, const char* msg)
|
||
|
|
-{
|
||
|
|
- jstring jMsg;
|
||
|
|
- if (debugObj != NULL) {
|
||
|
|
- jMsg = (*env)->NewStringUTF(env, msg);
|
||
|
|
- CHECK_NULL(jMsg);
|
||
|
|
- (*env)->CallVoidMethod(env, debugObj, debugPrintlnMethodID, jMsg);
|
||
|
|
- }
|
||
|
|
-}
|