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

8292033: Move jdk.X509Certificate event logic to JCA layer #1950

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 16, 2023

I backport this for parity with 11.0.20-oracle.

src/java.base/share/classes/sun/security/jca/JCAUtil.java
Trivial resolve due to context, but I had to adapt an instanceof
to Java 11.

test/lib/jdk/test/lib/security/TestCertificate.java
Remove """ strings.


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-8292033: Move jdk.X509Certificate event logic to JCA layer (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1950

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 16, 2023

👋 Welcome back goetz! 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 changed the title Backport 102b2b32feec4727145be4814eb1a69ef462ff16 8292033: Move jdk.X509Certificate event logic to JCA layer Jun 16, 2023
@openjdk
Copy link

openjdk bot commented Jun 16, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 16, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 16, 2023

Webrevs

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@openjdk
Copy link

openjdk bot commented Jun 21, 2023

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

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

8292033: Move jdk.X509Certificate event logic to JCA layer

Reviewed-by: lucy

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

  • 6e12eba: Merge
  • d286dde: 8303465: KeyStore of type KeychainStore, provider Apple does not show all trusted certificates
  • 20fe22f: 8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
  • e6aba91: 8229333: java/io/File/SetLastModified.java timed out
  • defa0b2: 8232195: Enable BigInteger tests: DivisionOverflow, SymmetricRangeTests and StringConstructorOverflow
  • 4452721: 8229338: clean up test/jdk/java/util/RandomAccess/Basic.java
  • 273987b: 8231357: sun/security/pkcs11/Cipher/TestKATForGCM.java fails on SLES11 using mozilla-nss-3.14
  • 0eb4503: 8231037: java/net/InetAddress/ptr/Lookup.java fails intermittently due to reverse lookup failed
  • dda5ed2: 8226221: Update PKCS11 tests to use NSS 3.46 libs
  • ade9973: 8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface
  • ... and 3 more: https://git.openjdk.org/jdk11u-dev/compare/d981db830aaecd42090de6038d2440d06874135c...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.

➡️ 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 Jun 21, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jun 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 25, 2023

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

  • b2e04df: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • 7f1047e: 8297955: LDAP CertStore should use LdapName and not String for DNs
  • 4a7557e: 8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
  • 513732d: 8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
  • 817254d: 8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
  • 77837e3: 8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
  • e30705e: 8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
  • 30f0493: 8239007: java/math/BigInteger/largeMemory/ tests should be disabled on 32-bit platforms
  • 114bb9a: 8239537: cgroup MetricsTester testMemorySubsystem fails sometimes when testing memory.kmem.tcp.usage_in_bytes
  • 5506f90: 8231516: network QuickAckTest.java failed due to "SocketException: maximum number of DatagramSockets reached"
  • ... and 16 more: https://git.openjdk.org/jdk11u-dev/compare/d981db830aaecd42090de6038d2440d06874135c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 25, 2023

@GoeLin Pushed as commit e0b98bc.

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

@GoeLin GoeLin deleted the goetz_backport_8292033-2 branch June 25, 2023 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants