Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8298872: Update CheckStatus.java for changes to TLS implementation #11857

Closed
wants to merge 8 commits into from

Conversation

mpdonova
Copy link
Contributor

@mpdonova mpdonova commented Jan 5, 2023

Updated the test for TLS 1.2 and removed from ProblemList.txt


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8298872: Update CheckStatus.java for changes to TLS implementation

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11857/head:pull/11857
$ git checkout pull/11857

Update a local copy of the PR:
$ git checkout pull/11857
$ git pull https://git.openjdk.org/jdk pull/11857/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11857

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11857.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 5, 2023

👋 Welcome back mpdonova! 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
Copy link

openjdk bot commented Jan 5, 2023

@mpdonova The following label will be automatically applied to this pull request:

  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the security security-dev@openjdk.org label Jan 5, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 5, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 5, 2023

Webrevs

@@ -79,10 +79,10 @@ public ConnectionTest()
ssle2 = sslc.createSSLEngine();

ssle1.setEnabledCipherSuites(new String [] {
"SSL_RSA_WITH_RC4_128_MD5"});
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is unrelated change to this fix, please revert.

@openjdk
Copy link

openjdk bot commented Jan 27, 2023

@mpdonova this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout check-status
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Jan 27, 2023
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Jan 27, 2023
@@ -43,42 +43,40 @@

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this test needs more enhancements. The test is run with jsse.enableCBCProtection disabled and you updated it run with TLSv1.2. Can you think of better test name/summary depending on the test scenario?

@openjdk
Copy link

openjdk bot commented Feb 2, 2023

@mpdonova 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:

8298872: Update CheckStatus.java for changes to TLS implementation

Reviewed-by: rhalade

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 130 new commits pushed to the master branch:

  • 20579e4: 8299994: java/security/Policy/Root/Root.java fails when home directory is read-only
  • 5962226: 8300891: Deprecate for removal javax.swing.plaf.synth.SynthLookAndFeel.load(URL url)
  • 8b70256: 8301787: java/net/httpclient/SpecialHeadersTest failing after JDK-8301306
  • bccd55b: 8300295: [AIX] TestDaemonDestroy fails due to !is_primordial_thread assertion
  • 7435b27: 8301744: Remove unused includes of genOopClosures.hpp
  • 6f9106e: 8301306: java/net/httpclient/* fail with -Xcomp
  • ac9e046: 8301479: Replace NULL with nullptr in os/linux
  • cf68d9f: 8299155: C2: SubTypeCheckNode::verify() should not produce dependencies / oop pool entries
  • 11804b2: 8301050: Detect Xen Virtualization on Linux aarch64
  • b504c94: 8300235: Use VarHandle access in Image(Input | Output)StreamImpl classes
  • ... and 120 more: https://git.openjdk.org/jdk/compare/e4252bb91478e9c2f0a5bbdae7cd663838d91b1b...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. Possible candidates are the reviewers of this PR (@rhalade) but any other Committer may sponsor as well.

➡️ 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).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 2, 2023
@mpdonova
Copy link
Contributor Author

mpdonova commented Feb 2, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 2, 2023
@openjdk
Copy link

openjdk bot commented Feb 2, 2023

@mpdonova
Your change (at version e0915bb) is now ready to be sponsored by a Committer.

@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Feb 3, 2023
@mpdonova
Copy link
Contributor Author

mpdonova commented Feb 3, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 3, 2023
@openjdk
Copy link

openjdk bot commented Feb 3, 2023

@mpdonova
Your change (at version e70aeb3) is now ready to be sponsored by a Committer.

@rhalade
Copy link
Member

rhalade commented Feb 3, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 3, 2023

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

  • 20579e4: 8299994: java/security/Policy/Root/Root.java fails when home directory is read-only
  • 5962226: 8300891: Deprecate for removal javax.swing.plaf.synth.SynthLookAndFeel.load(URL url)
  • 8b70256: 8301787: java/net/httpclient/SpecialHeadersTest failing after JDK-8301306
  • bccd55b: 8300295: [AIX] TestDaemonDestroy fails due to !is_primordial_thread assertion
  • 7435b27: 8301744: Remove unused includes of genOopClosures.hpp
  • 6f9106e: 8301306: java/net/httpclient/* fail with -Xcomp
  • ac9e046: 8301479: Replace NULL with nullptr in os/linux
  • cf68d9f: 8299155: C2: SubTypeCheckNode::verify() should not produce dependencies / oop pool entries
  • 11804b2: 8301050: Detect Xen Virtualization on Linux aarch64
  • b504c94: 8300235: Use VarHandle access in Image(Input | Output)StreamImpl classes
  • ... and 120 more: https://git.openjdk.org/jdk/compare/e4252bb91478e9c2f0a5bbdae7cd663838d91b1b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 3, 2023
@openjdk openjdk bot closed this Feb 3, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Feb 3, 2023
@openjdk
Copy link

openjdk bot commented Feb 3, 2023

@rhalade @mpdonova Pushed as commit e7247b1.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

2 participants