Merge pull request #754 from ibmruntimes/openj9-staging

Merge jdk-11.0.22+7 and the latest OpenJ9 changes to 0.43

closed/GensrcJ9JCL.gmk

@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2020, 2023 All Rights Reserved
+# (c) Copyright IBM Corp. 2020, 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
@@ -47,6 +47,7 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \
  src/java.base/share/classes/java/util/TimerTask.java \
  src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java \
  src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java \
+ src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java \
  src/java.base/share/classes/sun/security/jca/ProviderConfig.java \
  src/java.base/share/classes/sun/security/jca/ProviderList.java \
  src/java.base/share/classes/sun/security/provider/DigestBase.java \

closed/openjdk-tag.gmk

@@ -1 +1 @@
-OPENJDK_TAG := jdk-11.0.22+6
+OPENJDK_TAG := jdk-11.0.22+7

openj9-openjdk-notices

@@ -4,7 +4,7 @@ included with the JRE and JDK.
 If you do not wish to install the OpenSSL toolkit, you may delete the library
 from the JRE and JDK.
 
---- begin of LICENSE ---
+--- begin of LICENSE for OpenSSL 1.1.1 ---
 
  LICENSE ISSUES
  ==============
@@ -131,4 +131,185 @@ from the JRE and JDK.
  */
 
 
---- end of LICENSE ---
+--- end of LICENSE for OpenSSL 1.1.1 ---
+
+--- begin of LICENSE for OpenSSL 3.x ---
+
+ Apache License
+ Version 2.0, January 2004
+ https://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+--- end of LICENSE for OpenSSL 3.x ---

src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,6 +98,7 @@ public final class RSACipher extends CipherSpi {
 
  // cipher parameter for OAEP padding and TLS RSA premaster secret
  private AlgorithmParameterSpec spec = null;
+ private boolean forTlsPremasterSecret = false;
 
  // buffer for the data
  private byte[] buffer;
@@ -291,6 +292,7 @@ private void init(int opmode, Key key, SecureRandom random,
  }
 
  spec = params;
+ forTlsPremasterSecret = true;
  this.random = random; // for TLS RSA premaster secret
  }
  int blockType = (mode <= MODE_DECRYPT) ? RSAPadding.PAD_BLOCKTYPE_2
@@ -354,21 +356,38 @@ private byte[] doFinal() throws BadPaddingException,
  switch (mode) {
  case MODE_SIGN:
  paddingCopy = padding.pad(buffer, 0, bufOfs);
- result = RSACore.rsa(paddingCopy, privateKey, true);
+ if (paddingCopy != null) {
+ result = RSACore.rsa(paddingCopy, privateKey, true);
+ } else {
+ throw new BadPaddingException("Padding error in signing");
+ }
  break;
  case MODE_VERIFY:
  byte[] verifyBuffer = RSACore.convert(buffer, 0, bufOfs);
  paddingCopy = RSACore.rsa(verifyBuffer, publicKey);
  result = padding.unpad(paddingCopy);
+ if (result == null) {
+ throw new BadPaddingException
+ ("Padding error in verification");
+ }
  break;
  case MODE_ENCRYPT:
  paddingCopy = padding.pad(buffer, 0, bufOfs);
- result = RSACore.rsa(paddingCopy, publicKey);
+ if (paddingCopy != null) {
+ result = RSACore.rsa(paddingCopy, publicKey);
+ } else {
+ throw new BadPaddingException
+ ("Padding error in encryption");
+ }
  break;
  case MODE_DECRYPT:
  byte[] decryptBuffer = RSACore.convert(buffer, 0, bufOfs);
  paddingCopy = RSACore.rsa(decryptBuffer, privateKey, false);
  result = padding.unpad(paddingCopy);
+ if (result == null && !forTlsPremasterSecret) {
+ throw new BadPaddingException
+ ("Padding error in decryption");
+ }
  break;
  default:
  throw new AssertionError("Internal error");
@@ -377,9 +396,9 @@ private byte[] doFinal() throws BadPaddingException,
  } finally {
  Arrays.fill(buffer, 0, bufOfs, (byte)0);
  bufOfs = 0;
- if (paddingCopy != null // will not happen
+ if (paddingCopy != null
  && paddingCopy != buffer // already cleaned
- && paddingCopy != result) { // DO NOT CLEAN, THIS IS RESULT!
+ && paddingCopy != result) { // DO NOT CLEAN, THIS IS RESULT
  Arrays.fill(paddingCopy, (byte)0);
  }
  }
@@ -454,26 +473,22 @@ protected Key engineUnwrap(byte[] wrappedKey, String algorithm,
 
  boolean isTlsRsaPremasterSecret =
  algorithm.equals("TlsRsaPremasterSecret");
- Exception failover = null;
  byte[] encoded = null;
 
  update(wrappedKey, 0, wrappedKey.length);
  try {
  encoded = doFinal();
- } catch (BadPaddingException e) {
- if (isTlsRsaPremasterSecret) {
- failover = e;
- } else {
- throw new InvalidKeyException("Unwrapping failed", e);
- }
- } catch (IllegalBlockSizeException e) {
- // should not occur, handled with length check above
+ } catch (BadPaddingException | IllegalBlockSizeException e) {
+ // BadPaddingException cannot happen for TLS RSA unwrap.
+ // In that case, padding error is indicated by returning null.
+ // IllegalBlockSizeException cannot happen in any case,
+ // because of the length check above.
  throw new InvalidKeyException("Unwrapping failed", e);
  }
 
  try {
  if (isTlsRsaPremasterSecret) {
- if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
+ if (!forTlsPremasterSecret) {
  throw new IllegalStateException(
  "No TlsRsaPremasterSecretParameterSpec specified");
  }
@@ -482,7 +497,7 @@ protected Key engineUnwrap(byte[] wrappedKey, String algorithm,
  encoded = KeyUtil.checkTlsPreMasterSecretKey(
  ((TlsRsaPremasterSecretParameterSpec) spec).getClientVersion(),
  ((TlsRsaPremasterSecretParameterSpec) spec).getServerVersion(),
- random, encoded, (failover != null));
+ random, encoded, encoded == null);
  }
 
  return ConstructKeys.constructKey(encoded, algorithm, type);

src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java

@@ -22,6 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved
+ * ===========================================================================
+ */
 
 package jdk.internal.ref;
 
@@ -30,6 +35,10 @@
 import java.lang.ref.PhantomReference;
 import java.util.Objects;
 
+/*[IF CRIU_SUPPORT]*/
+import openj9.internal.criu.NotCheckpointSafe;
+/*[ENDIF] CRIU_SUPPORT */
+
 /**
  * PhantomCleanable subclasses efficiently encapsulate cleanup state and
  * the cleaning action.
@@ -83,6 +92,9 @@ public PhantomCleanable(T referent, Cleaner cleaner) {
  /**
  * Insert this PhantomCleanable after the list head.
  */
+ /*[IF CRIU_SUPPORT]*/
+ @NotCheckpointSafe
+ /*[ENDIF] CRIU_SUPPORT */
  private void insert() {
  synchronized (list) {
  prev = list;
@@ -98,6 +110,9 @@ private void insert() {
  * @return true if Cleanable was removed or false if not because
  * it had already been removed before
  */
+ /*[IF CRIU_SUPPORT]*/
+ @NotCheckpointSafe
+ /*[ENDIF] CRIU_SUPPORT */
  private boolean remove() {
  synchronized (list) {
  if (next != this) {
@@ -116,6 +131,9 @@ private boolean remove() {
  *
  * @return true if the list is empty
  */
+ /*[IF CRIU_SUPPORT]*/
+ @NotCheckpointSafe
+ /*[ENDIF] CRIU_SUPPORT */
  boolean isListEmpty() {
  synchronized (list) {
  return list == list.next;