From 2a5eac8b71d9f4291337f2e6ec1b73bea10ca250 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Mon, 13 Nov 2023 14:08:40 -0500 Subject: [PATCH] Add FIPS NSS support on p/z linux platforms --- closed/custom/modules/java.base/Copy.gmk | 4 ++-- .../classes/openj9/internal/security/RestrictedSecurity.java | 2 +- src/java.base/share/conf/security/java.security | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/closed/custom/modules/java.base/Copy.gmk b/closed/custom/modules/java.base/Copy.gmk index a20152e2304..050bfeb3228 100644 --- a/closed/custom/modules/java.base/Copy.gmk +++ b/closed/custom/modules/java.base/Copy.gmk @@ -243,9 +243,9 @@ ifneq ($(OPENSSL_BUNDLE_LIB_PATH), ) endif # OPENJ9_ENABLE_JITSERVER endif # OPENSSL_BUNDLE_LIB_PATH ################################################################################ -# Copy the nss.fips.cfg only on x86 linux +# Copy the nss.fips.cfg only on x86/p/z linux -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), linux-x86) +ifneq ($(filter linux-x86 linux-ppc64le linux-s390x, $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU)), ) NSS_FIPS_CFG_SRC := $(TOPDIR)/closed/src/java.base/share/conf/security/nss.fips.cfg NSS_FIPS_CFG_DST := $(CONF_DST_DIR)/security/nss.fips.cfg diff --git a/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java b/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java index 9bacf62f094..a41ffd84d1d 100644 --- a/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java +++ b/closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java @@ -64,7 +64,7 @@ public final class RestrictedSecurity { private static RestrictedSecurityProperties restricts; - private static final List supportPlatforms = List.of("amd64"); + private static final List supportPlatforms = List.of("amd64", "ppc64le", "s390x"); static { @SuppressWarnings("removal") diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security index 7fe0e69659b..717b6f276f1 100644 --- a/src/java.base/share/conf/security/java.security +++ b/src/java.base/share/conf/security/java.security @@ -82,7 +82,7 @@ security.provider.tbd=Apple #endif security.provider.tbd=SunPKCS11 -#ifdef linux-x86 +#if defined (linux-x86) || defined (linux-ppc64le) || defined (linux-s390x) # # Java Restricted Security Mode #