Merge openj9 into openj9-staging

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
ibmruntimes · Aug 12, 2024 · 5db1640 · 5db1640
2 parents 876982e + e7d543e
commit 5db1640
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/closed/test/jtreg-ext/requires/OpenJ9PropsExt.java b/closed/test/jtreg-ext/requires/OpenJ9PropsExt.java
@@ -40,6 +40,7 @@ public Map<String, String> call() {
  map.put("vm.bits", vmBits());
  map.put("vm.compiler2.enabled", "false");
  map.put("vm.debug", "false");
+ map.put("vm.flagless", "true");
  map.put("vm.gc.G1", "false");
  map.put("vm.gc.Parallel", "false");
  map.put("vm.gc.Serial", "false");

diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
@@ -182,7 +182,7 @@ RestrictedSecurity.NSS.140-2.securerandom.algorithm = PKCS11
 RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.name = OpenJCEPlusFIPS Cryptographic Module FIPS 140-3
 RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.default = false
 RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.fips = true
-RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.hash = SHA256:e71c49d65fd291efe75993ccbe6999e6cfb26bf9ef3e8424cb086c7e2a225ce6
+RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.hash = SHA256:dd19c8f8f2578cf400c11b5c7d003684cba5fc4999ac5c55d2a73099f70f9582
 RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.number = Certificate #XXX
 RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.policy = https://csrc.nist.gov/projects/cryptographic-module-validation-program/certificate/
 RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.desc.sunsetDate = 2026-09-21
@@ -207,7 +207,11 @@ RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3.tls.disabledAlgorithms = \
  TLS_DHE_DSS_WITH_AES_256_CBC_SHA256, \
  TLS_DHE_DSS_WITH_AES_256_GCM_SHA384, \
  TLS_DHE_RSA_WITH_AES_128_CBC_SHA, \
+ TLS_DHE_RSA_WITH_AES_128_CBC_SHA256, \
+ TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, \
  TLS_DHE_RSA_WITH_AES_256_CBC_SHA, \
+ TLS_DHE_RSA_WITH_AES_256_CBC_SHA256, \
+ TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, \
  TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, \
  TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, \
  TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, \