8277307: Pre shared key sent under both session_ticket and pre_shared_key extensions

[franferrax]

Requesting backport for parity with 17.0.11-oracle.

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• JDK-8277307 needs maintainer approval

Issue

• JDK-8277307: Pre shared key sent under both session_ticket and pre_shared_key extensions (Bug - P3 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1946/head:pull/1946
$ git checkout pull/1946

Update a local copy of the PR:
$ git checkout pull/1946
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1946/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1946

View PR using the GUI difftool:
$ git pr show -t 1946

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1946.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back fferrari! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[openjdk]

⚠️ @franferrax This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[mlbridge]

Webrevs

• 00: Full (785e8518)

[franferrax]

/approval request 8277307 Clean backport requested for parity with 17.0.11-oracle.

[openjdk]

@franferrax
8277307: The approval request has been created successfully.

[franferrax]

Hi @GoeLin, just in case the notification was missed, I wanted to let you know that I provided further details in a new comment in JDK-8277307.

[jerboaa]

Please mention what kind of testing you have done for this. Thanks!

[franferrax]

Please mention what kind of testing you have done for this. Thanks!

Hi @jerboaa, I was relying on GH actions catching any regression. But now that you mentioned, I'm realizing that the test extended by this backport to assert the TLS1.2 session ticket is empty when negotiating TLS 1.3 isn't included (ResumeTLS13withSNI.java).

So I ran the whole test/jdk/javax/net/ssl category including it, along with other 180 tests. It passed 100% with a 785e851 Linux release build. I've also debugged ResumeTLS13withSNI.java to ensure the new assertion is exercised.

[jerboaa]

Please mention what kind of testing you have done for this. Thanks!

Hi @jerboaa, I was relying on GH actions catching any regression. But now that you mentioned, I'm realizing that the test extended by this backport to assert the TLS1.2 session ticket is empty when negotiating TLS 1.3 isn't included (ResumeTLS13withSNI.java).

So I ran the whole test/jdk/javax/net/ssl category including it, along with other 180 tests. It passed 100% with a 785e851 Linux release build. I've also debugged ResumeTLS13withSNI.java to ensure the new assertion is exercised.

Thanks. That's always good to know and a good habit to include in "Fix Request" comments.

[openjdk]

@franferrax This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8277307: Pre shared key sent under both session_ticket and pre_shared_key extensions

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 34 new commits pushed to the master branch:

• d335f04: 8293343: sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.java failed with "Agent communication error: java.io.EOFException"
• 1d7bc8f: 8313781: Add regression tests for large page logging and user-facing error messages
• 5531ca5: 8313782: Add user-facing warning if THPs are enabled but cannot be used
• 0f2da83: 8316746: Top of lock-stack does not match the unlocked object
• 2da7aeb: 8310656: RISC-V: __builtin___clear_cache can fail silently.
• 40c29f7: 8279856: Parallel: Use PreservedMarks to record promotion-failed objects
• 2a37bae: 8262186: Call X509KeyManager.chooseClientAlias once for all key types
• b7605b7: 8302109: Trivial fixes to btree tests
• c478c81: 8292067: Convert test/sun/management/jmxremote/bootstrap shell tests to java version
• e4ddf06: 8320053: GHA: Cross-compile gtest code
• ... and 24 more: https://git.openjdk.org/jdk17u-dev/compare/4b6ac09ae98e10a58155b95d289c30278eeae666...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[jerboaa]

@franferrax Please integrate and I can help sponsor this change so it gets in before rampdown (today).

[franferrax]

Awesome, thanks @jerboaa and @GoeLin for your guidance.

[franferrax]

/integrate

[openjdk]

@franferrax
Your change (at version 785e851) is now ready to be sponsored by a Committer.

[jerboaa]

/sponsor

[openjdk]

Going to push as commit 9128c89.
Since your change was applied there have been 35 commits pushed to the master branch:

• 770b3d6: 8320209: VectorMaskGen clobbers rflags on x86_64
• d335f04: 8293343: sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.java failed with "Agent communication error: java.io.EOFException"
• 1d7bc8f: 8313781: Add regression tests for large page logging and user-facing error messages
• 5531ca5: 8313782: Add user-facing warning if THPs are enabled but cannot be used
• 0f2da83: 8316746: Top of lock-stack does not match the unlocked object
• 2da7aeb: 8310656: RISC-V: __builtin___clear_cache can fail silently.
• 40c29f7: 8279856: Parallel: Use PreservedMarks to record promotion-failed objects
• 2a37bae: 8262186: Call X509KeyManager.chooseClientAlias once for all key types
• b7605b7: 8302109: Trivial fixes to btree tests
• c478c81: 8292067: Convert test/sun/management/jmxremote/bootstrap shell tests to java version
• ... and 25 more: https://git.openjdk.org/jdk17u-dev/compare/4b6ac09ae98e10a58155b95d289c30278eeae666...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa @franferrax Pushed as commit 9128c89.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.