Skip to content

8255348: NPE in PKIXCertPathValidator event logging code #2150

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

8255348: NPE in PKIXCertPathValidator event logging code #2150

wants to merge 2 commits into from

Conversation

coffeys
Copy link
Contributor

@coffeys coffeys commented Jan 19, 2021 •
edited by openjdk bot
Loading

Correction of NPE and updating of test cases. Minor refactoring of test library also.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8255348: NPE in PKIXCertPathValidator event logging code

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2150/head:pull/2150
$ git checkout pull/2150

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 19, 2021

👋 Welcome back coffeys! 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 openjdk bot added the rfr Pull request is ready for review label Jan 19, 2021
@openjdk
Copy link

openjdk bot commented Jan 19, 2021

@coffeys The following labels will be automatically applied to this pull request:

  • hotspot-jfr
  • security

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

@openjdk openjdk bot added security security-dev@openjdk.org hotspot-jfr hotspot-jfr-dev@openjdk.org labels Jan 19, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 19, 2021 •
edited
Loading

Webrevs

seanjmullan
seanjmullan reviewed Jan 21, 2021
View reviewed changes
src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java Outdated
anchor.getTrustedCert().hashCode();
int anchorCertId = 0;
X509Certificate trustedCert = anchor.getTrustedCert();
if (trustedCert != null) {
Copy link
Member

Choose a reason for hiding this comment

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

You could use the anchorCert variable which was set earlier instead of calling getTrustedCert() again.

src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java Outdated
if (trustedCert != null) {
anchorCertId = trustedCert.hashCode();
} else {
if (anchor.getCAPublicKey() != null) {
Copy link
Member

Choose a reason for hiding this comment

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

Per the TrustAnchor API, you can't create a TrustAnchor with a null public key, so I don't think you need this check.

@mlbridge
Copy link

mlbridge bot commented Jan 22, 2021

Mailing list message from Se=c3=a1n Coffey on hotspot-jfr-dev:

Thanks for the comments Sean. Code updated.

https://github.com//pull/2150/commits/8a344a85303297f17a6e75e7c1f423c2d16c451a

regards,
Sean.

On 21/01/2021 19:47, Sean Mullan wrote:

@openjdk
Copy link

openjdk bot commented Jan 22, 2021

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

8255348: NPE in PKIXCertPathValidator event logging code

Reviewed-by: mullan

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

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 22, 2021
@coffeys
Copy link
Contributor Author

coffeys commented Jan 22, 2021

/integrate

@openjdk openjdk bot closed this Jan 22, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 22, 2021
@openjdk
Copy link

openjdk bot commented Jan 22, 2021

@coffeys Since your change was applied there have been 264 commits pushed to the master branch:

  • a97f3c1: 8258853: Support separate function declaration and definition with ENABLE_IF-based SFINAE
  • 154e1d6: 8259009: G1 heap summary should be shown in "Heap Parameters" window on HSDB
  • acbcde8: 8256111: Create implementation for NSAccessibilityStaticText protocol
  • f928265: 8260009: InstanceKlass::has_as_permitted_subclass() fails if subclass was redefined
  • 7ed8ba1: 8256814: WeakProcessorPhases may be redundant
  • bfac3fb: 8260212: Shenandoah: resolve-only UpdateRefsMode is not used
  • 58ceb25: 8259842: Remove Result cache from StringCoding
  • d066f2b: 8260030: Improve stringStream buffer handling
  • 1452280: 8164484: Unity, JTable cell editor, javax/swing/JComboBox/6559152/bug6559152.java
  • a70acf2: 8259928: compiler/jvmci tests fail with -Xint
  • ... and 254 more: https://git.openjdk.java.net/jdk/compare/f91f92dcaadca3e5e7fd8d1300d8e24f7872f562...master

Your commit was automatically rebased without conflicts.

Pushed as commit 18eb6d9.

💡 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
Reviewers

@seanjmullan seanjmullan seanjmullan approved these changes

Assignees
No one assigned
Labels
hotspot-jfr hotspot-jfr-dev@openjdk.org integrated Pull request has been integrated security security-dev@openjdk.org
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@coffeys @seanjmullan