From b546b7f82999eb03c96ba97e9b5c04f847ac17e5 Mon Sep 17 00:00:00 2001 From: Kostas Tsiounis Date: Fri, 2 Feb 2024 18:09:05 -0500 Subject: [PATCH] Add s390x-linux to platforms bundling OpenJCEPlus --- closed/make/modules/openjceplus/Lib.gmk | 4 +++- .../classes/openj9/internal/security/RestrictedSecurity.java | 2 +- src/java.base/share/conf/security/java.security | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/closed/make/modules/openjceplus/Lib.gmk b/closed/make/modules/openjceplus/Lib.gmk index e064c50e48b..21dedc3bd24 100644 --- a/closed/make/modules/openjceplus/Lib.gmk +++ b/closed/make/modules/openjceplus/Lib.gmk @@ -1,5 +1,5 @@ # =========================================================================== -# (c) Copyright IBM Corp. 2023, 2023 All Rights Reserved +# (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -35,6 +35,8 @@ ifeq ($(call isTargetOs, aix), true) else ifeq ($(call isTargetOs, linux), true) ifeq ($(call isTargetCpu, ppc64le), true) OPENJCEPLUS_JGSKIT_PLATFORM := ppcle-linux64 + else ifeq ($(call isTargetCpu, s390x), true) + OPENJCEPLUS_JGSKIT_PLATFORM := s390-linux64 else ifeq ($(call isTargetCpu, x86_64), true) OPENJCEPLUS_JGSKIT_PLATFORM := x86-linux64 endif 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 4080d338185..67ed45c31a8 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 @@ -78,7 +78,7 @@ public final class RestrictedSecurity { supportedPlatformsNSS.put("Arch", List.of("amd64", "ppc64le", "s390x")); supportedPlatformsNSS.put("OS", List.of("Linux")); - supportedPlatformsOpenJCEPlus.put("Arch", List.of("amd64", "ppc64")); + supportedPlatformsOpenJCEPlus.put("Arch", List.of("amd64", "ppc64", "s390x")); supportedPlatformsOpenJCEPlus.put("OS", List.of("Linux", "AIX", "Windows")); @SuppressWarnings("removal") diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security index 804cc859c7f..21b78e28ec9 100644 --- a/src/java.base/share/conf/security/java.security +++ b/src/java.base/share/conf/security/java.security @@ -152,7 +152,7 @@ RestrictedSecurity.NSS.140-2.securerandom.provider = SunPKCS11-NSS-FIPS RestrictedSecurity.NSS.140-2.securerandom.algorithm = PKCS11 #endif -#if defined aix-ppc || defined linux-ppc || defined linux-x86 || defined windows +#if defined aix-ppc || defined linux-ppc || defined linux-s390 || defined linux-x86 || defined windows RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.name = OpenJCEPlusFIPS Cryptographic Module FIPS 140-3 RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.default = true RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.fips = true