8260274: Cipher.init(int, key) does not use highest priority provider for random bytes #1902

RealLucy · 2023-05-25T13:18:10Z

This backport is done for 11.0.20-oracle parity.

The patch applies cleanly except for copyright header mismatches after the predecessor patch JDK-8246383.
Unfortunately, the newly introduced TestDefaultRandom.java uses switch expressions which are not available in jdk11. The test had to be backfitted to compile with jdk11.

Tests (GHA and SAP internal) sucessful after test update.
Separate execution of TestDefaultRandom.java (new test) successful with this patch applied. fails otherwise.

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-8260274: Cipher.init(int, key) does not use highest priority provider for random bytes (Bug - "4")

Reviewers

Goetz Lindenmaier (@GoeLin - Reviewer)
Martin Doerr (@TheRealMDoerr - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1902

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-05-25T13:18:44Z

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

openjdk · 2023-05-25T13:19:55Z

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

mlbridge · 2023-05-25T13:25:47Z

Webrevs

RealLucy · 2023-05-25T13:36:37Z

/clean

openjdk · 2023-05-25T13:37:08Z

@RealLucy This backport pull request is now marked as clean

RealLucy · 2023-05-26T13:37:19Z

/reviewer 1

openjdk · 2023-05-26T13:38:02Z

@RealLucy Syntax: /reviewer (credit|remove) [@user | openjdk-user]+. For example:

/reviewer credit @openjdk-bot
/reviewer credit duke
/reviewer credit @user1 @user2

RealLucy · 2023-05-26T13:43:20Z

/review 1

openjdk · 2023-05-26T13:44:30Z

@RealLucy Unknown command review - for a list of valid commands use /help.

GoeLin · 2023-05-26T14:25:27Z

/reviewer 1

openjdk · 2023-05-26T14:25:46Z

@GoeLin Only the author (@RealLucy) is allowed to issue the reviewer command.

GoeLin · 2023-05-26T14:26:22Z

/help

openjdk · 2023-05-26T14:26:51Z

@GoeLin Available commands:

backport - create a backport
cc - add or remove an additional classification label
clean - Mark the backport pull request as a clean backport
contributor - adds or removes additional contributors for a PR
covered - used when employer has signed the OCA
csr - require a compatibility and specification request (CSR) for this pull request
help - shows this text
integrate - performs integration of the changes in the PR
issue - edit the list of issues that this PR solves
jep - require a JDK Enhancement Proposal (JEP) for this pull request
label - add or remove an additional classification label
open - Set the pull request state to "open"
reviewer - manage additional reviewers for a PR
reviewers - set the number of additional required reviewers for this PR
signed - used after signing the OCA
solves - edit the list of issues that this PR solves
sponsor - performs integration of a PR that is authored by a non-committer
summary - updates the summary in the commit message
test - used to run tests

GoeLin · 2023-05-26T14:27:09Z

/reviewers 1

GoeLin · 2023-05-26T14:27:44Z

/help clean

openjdk · 2023-05-26T14:28:13Z

@GoeLin
Warning: By issuing the /reviewers command in this clean backport pull request, the reviewers check has now been enabled.
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 1 (with at least 1 Reviewer).

openjdk · 2023-05-26T14:29:29Z

@GoeLin Available commands:

backport - create a backport
cc - add or remove an additional classification label
clean - Mark the backport pull request as a clean backport
contributor - adds or removes additional contributors for a PR
covered - used when employer has signed the OCA
csr - require a compatibility and specification request (CSR) for this pull request
help - shows this text
integrate - performs integration of the changes in the PR
issue - edit the list of issues that this PR solves
jep - require a JDK Enhancement Proposal (JEP) for this pull request
label - add or remove an additional classification label
open - Set the pull request state to "open"
reviewer - manage additional reviewers for a PR
reviewers - set the number of additional required reviewers for this PR
signed - used after signing the OCA
solves - edit the list of issues that this PR solves
sponsor - performs integration of a PR that is authored by a non-committer
summary - updates the summary in the commit message
test - used to run tests

RealLucy · 2023-05-26T14:33:45Z

/reviewers 1

openjdk · 2023-05-26T14:35:29Z

@RealLucy
Warning: By issuing the /reviewers command in this clean backport pull request, the reviewers check has now been enabled.
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 1 (with at least 1 Reviewer).

openjdk-notifier · 2023-05-30T09:46:59Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8260274
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

GoeLin · 2023-05-30T13:45:31Z

LGTM, code basically identical to head, Test works nicely.

TheRealMDoerr

LGTM. Thanks for backporting!

openjdk · 2023-05-30T13:47:37Z

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

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

8260274: Cipher.init(int, key) does not use highest priority provider for random bytes

Reviewed-by: goetz, mdoerr

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

7a35741: 8158880: test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java fail with zh_CN locale
3207e73: 8279536: jdk/nio/zipfs/ZipFSOutputStreamTest.java timed out
81bb36e: 8301491: C2: java.lang.StringUTF16::indexOfChar intrinsic called with negative character argument
d917caa: 8297730: C2: Arraycopy intrinsic throws incorrect exception
3ba2a18: 8223573: Replace wildcard address with loopback or local host in tests - part 4
3cdce91: 8217237: HttpClient does not deal well with multi-valued WWW-Authenticate challenge headers
19bd319: 8212045: Add back the tests that were removed from HashesTest.java and AddExportsTest.java
4267a37: 8303809: Dispose context in SPNEGO NegotiatorImpl
b2faa35: 8309108: Bump update version for OpenJDK: jdk-11.0.21
1000b1c: 8308884: [17u/11u] Backout JDK-8297951
... and 1 more: https://git.openjdk.org/jdk11u-dev/compare/398753e0b57bedb3d5e5c2b6487ee854288bd858...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.

RealLucy · 2023-05-30T14:24:18Z

Thanks for the reviews, Martin & Goetz!
JBS bug flagged with fix-request.

RealLucy · 2023-06-15T10:02:23Z

/integrate

openjdk · 2023-06-15T10:04:08Z

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

d7701cd: 8242897: KeyFactory.generatePublic( x509Spec ) failed with java.security.InvalidKeyException
ad283ae: 8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML
c1bb926: 8309138: Fix container tests for jdks with symlinked conf dir
3bc72d0: 8242151: Improve OID mapping and reuse among JDK security providers for aliases registration
26652c8: 8308156: VerifyCACerts.java misses blank in error output
c1b7fd2: 8223714: HTTPSetAuthenticatorTest could be made more resilient
9fe6ade: 8229912: [TESTBUG] java/net/Socks/SocksIPv6Test fails without IPv6
0fdd6dd: 8224617: (fs) java/nio/file/FileStore/Basic.java found filesystem twice
d0252df: 8229348: java/net/DatagramSocket/UnreferencedDatagramSockets.java fails intermittently
7c6beb1: 8219628: [TESTBUG] javadoc/doclet/InheritDocForUserTags fails with -othervm
... and 21 more: https://git.openjdk.org/jdk11u-dev/compare/398753e0b57bedb3d5e5c2b6487ee854288bd858...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-06-15T10:04:20Z

@RealLucy Pushed as commit c1939dd.

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

RealLucy added 2 commits May 25, 2023 14:34

Backport 03f2ab3

0ffa220

Backport 434a399

77daed9

openjdk bot changed the title ~~Backport 434a399bea4b116f14df963a5f5045608956a772~~ 8260274: Cipher.init(int, key) does not use highest priority provider for random bytes May 25, 2023

openjdk bot added backport rfr Pull request is ready for review labels May 25, 2023

openjdk bot added the clean label May 25, 2023

JDK-8260274: avoid use of switch expressions

5cf3b10

openjdk-notifier bot changed the base branch from pr/1901 to master May 30, 2023 09:46

JDK-8260274 merge master

00d0ebc

GoeLin approved these changes May 30, 2023

View reviewed changes

TheRealMDoerr approved these changes May 30, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 30, 2023

openjdk bot added the integrated Pull request has been integrated label Jun 15, 2023

openjdk bot closed this Jun 15, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 15, 2023

8260274: Cipher.init(int, key) does not use highest priority provider for random bytes #1902

8260274: Cipher.init(int, key) does not use highest priority provider for random bytes #1902

RealLucy commented May 25, 2023 •

edited by openjdk bot

bridgekeeper bot commented May 25, 2023

openjdk bot commented May 25, 2023

mlbridge bot commented May 25, 2023 •

edited

RealLucy commented May 25, 2023

openjdk bot commented May 25, 2023

RealLucy commented May 26, 2023

openjdk bot commented May 26, 2023

RealLucy commented May 26, 2023

openjdk bot commented May 26, 2023

GoeLin commented May 26, 2023

openjdk bot commented May 26, 2023

GoeLin commented May 26, 2023

openjdk bot commented May 26, 2023

GoeLin commented May 26, 2023

GoeLin commented May 26, 2023

openjdk bot commented May 26, 2023

openjdk bot commented May 26, 2023

RealLucy commented May 26, 2023

openjdk bot commented May 26, 2023

openjdk-notifier bot commented May 30, 2023

GoeLin commented May 30, 2023

TheRealMDoerr left a comment

openjdk bot commented May 30, 2023 •

edited

RealLucy commented May 30, 2023

RealLucy commented Jun 15, 2023

openjdk bot commented Jun 15, 2023

openjdk bot commented Jun 15, 2023

8260274: Cipher.init(int, key) does not use highest priority provider for random bytes #1902

8260274: Cipher.init(int, key) does not use highest priority provider for random bytes #1902

Conversation

RealLucy commented May 25, 2023 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented May 25, 2023

openjdk bot commented May 25, 2023

mlbridge bot commented May 25, 2023 • edited

Webrevs

RealLucy commented May 25, 2023

openjdk bot commented May 25, 2023

RealLucy commented May 26, 2023

openjdk bot commented May 26, 2023

RealLucy commented May 26, 2023

openjdk bot commented May 26, 2023

GoeLin commented May 26, 2023

openjdk bot commented May 26, 2023

GoeLin commented May 26, 2023

openjdk bot commented May 26, 2023

GoeLin commented May 26, 2023

GoeLin commented May 26, 2023

openjdk bot commented May 26, 2023

openjdk bot commented May 26, 2023

RealLucy commented May 26, 2023

openjdk bot commented May 26, 2023

openjdk-notifier bot commented May 30, 2023

GoeLin commented May 30, 2023

TheRealMDoerr left a comment

Choose a reason for hiding this comment

openjdk bot commented May 30, 2023 • edited

RealLucy commented May 30, 2023

RealLucy commented Jun 15, 2023

openjdk bot commented Jun 15, 2023

openjdk bot commented Jun 15, 2023

RealLucy commented May 25, 2023 •

edited by openjdk bot

mlbridge bot commented May 25, 2023 •

edited

openjdk bot commented May 30, 2023 •

edited