diff --git a/closed/make/modules/openjceplus/Lib.gmk b/closed/make/modules/openjceplus/Lib.gmk index 21dedc3bd24..2584306bfb6 100644 --- a/closed/make/modules/openjceplus/Lib.gmk +++ b/closed/make/modules/openjceplus/Lib.gmk @@ -48,6 +48,13 @@ else ifeq ($(call isTargetOs, windows), true) OPENJCEPLUS_JGSKIT_MAKE := jgskit.win64.mak OPENJCEPLUS_JGSKIT_PLATFORM := win64 endif +else ifeq ($(call isTargetOs, macosx), true) + $(info OPENJDK_TARGET_OS is: $(OPENJDK_TARGET_OS)) + $(info OPENJDK_TARGET_CPU is: $(OPENJDK_TARGET_CPU)) + $(info OPENJCEPLUS_GSKIT_HOME is: $(OPENJCEPLUS_GSKIT_HOME)) + OPENJCEPLUS_JGSKIT_MAKE := jgskit.mac.mak + $(info OPENJCEPLUS_JGSKIT_MAKE is: $(OPENJCEPLUS_JGSKIT_MAKE)) + OPENJCEPLUS_JGSKIT_PLATFORM := aarch64_mac endif ifeq (,$(OPENJCEPLUS_JGSKIT_PLATFORM)) 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 c051e380a07..525809421af 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 @@ -91,7 +91,7 @@ public final class RestrictedSecurity { supportedPlatformsNSS.put("OS", List.of("Linux")); supportedPlatformsOpenJCEPlus.put("Arch", List.of("amd64", "ppc64", "s390x")); - supportedPlatformsOpenJCEPlus.put("OS", List.of("Linux", "AIX", "Windows")); + supportedPlatformsOpenJCEPlus.put("OS", List.of("Linux", "AIX", "Windows", "Mac")); @SuppressWarnings("removal") String[] props = AccessController.doPrivileged( diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security index 152ad16d2d3..e37bb75b925 100644 --- a/src/java.base/share/conf/security/java.security +++ b/src/java.base/share/conf/security/java.security @@ -157,7 +157,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-s390 || defined linux-x86 || defined windows +#if defined aix-ppc || defined linux-ppc || defined linux-s390 || defined linux-x86 || defined windows || defined macosx # # Strict Restricted Security mode profile for FIPS 140-3. This policy represents only allowable # approved cryptography in the OpenJCEPlusFIPS provider along with other non-cryptographic algorithms