b267c4cf63
- Update to jdk-17+35, also known as jdk-17-ga. - Remove boot JDKs in favour of OpenJDK 17 build now in the buildroot. - Update buildjdkver to 17 so as to build with itself - Add possibility to disable system crypto policy - Add PR3695 to allow the system crypto policy to be turned off - Re-enable TestSecurityProperties after inclusion of PR3695 - Added gating.yaml - Fix patch rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch - Use the "reverse" build loop (debug first) as the main and only build loop to get more diagnostics. - Remove restriction on disabling product build, as debug packages no longer have javadoc packages. - Update to jdk-17+33, including JDWP fix and July 2021 CPU - Support the FIPS mode crypto policy (RH1655466) - Update RH1655466 FIPS patch with changes in OpenJDK 8 version. - SunPKCS11 runtime provider name is a concatenation of "SunPKCS11-" and the name in the config file. - Change nss.fips.cfg config name to "NSS-FIPS" to avoid confusion with nss.cfg. - No need to substitute path to nss.fips.cfg as java.security file supports a java.home variable. - Disable FIPS mode support unless com.redhat.fips is set to "true". - Use appropriate keystore types when in FIPS mode (RH1818909) - Enable alignment with FIPS crypto policy by default (-Dcom.redhat.fips=false to disable). - Disable TLSv1.3 when the FIPS crypto policy and the NSS-FIPS provider are in use (RH1860986) - Add explicit runtime dependency on NSS for the PKCS11 provider in FIPS mode - Move setup of JavaSecuritySystemConfiguratorAccess to Security class so it always occurs (RH1915071) - Detect FIPS using SECMOD_GetSystemFIPSEnabled in the new libsystemconf JDK library. - Minor code cleanups on FIPS detection patch and check for SECMOD_GetSystemFIPSEnabled in configure. - Remove unneeded Requires on NSS as it will now be dynamically linked and detected by RPM. - Add patch to disable non-FIPS crypto in the SUN and SunEC security providers. - Add patch to login to the NSS software token when in FIPS mode. - Fix unused function compiler warning found in systemconf.c - Extend the default security policy to accomodate PKCS11 accessing jdk.internal.access. - Add JDK-8272332 fix so we actually link against HarfBuzz. - Update release notes to document the major changes between OpenJDK 11 & 17. - Add FIPS patch to allow plain key import. - Allow plain key import to be disabled with -Dcom.redhat.fips.plainKeySupport=false - Patch syslookup.c so it actually has some code to be compiled into libsyslookup - alternatives creation moved to posttrans - Set LTS designator on RHEL, but not Fedora or EPEL. Related: RHEL-45216
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);
|
|
- }
|
|
-}
|