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

8285696: AlgorithmConstraints:permits not throwing IllegalArgumentException when 'alg' is null #1182

Closed
wants to merge 4 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 24, 2022

I backport this for parity with 11.0.17-oracle.


Progress

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

Issue

  • JDK-8285696: AlgorithmConstraints:permits not throwing IllegalArgumentException when 'alg' is null

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1182

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 24, 2022

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/1181 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 47951655acacba515c0d69f5192257664f887dba 8285696: AlgorithmConstraints:permits not throwing IllegalArgumentException when 'alg' is null Jun 24, 2022
@openjdk
Copy link

openjdk bot commented Jun 24, 2022

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

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Jun 24, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 24, 2022

Webrevs

@@ -159,6 +159,9 @@ public final boolean permits(Set<CryptoPrimitive> primitives,
if (!cachedCheckAlgorithm(algorithm)) {
return false;
}
if (algorithm == null || algorithm.isEmpty()) {
Copy link
Member

Choose a reason for hiding this comment

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

The check for null algorithm needs to happen before cachedCheckAlgorithm is called

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed. Thanks for catching this!

Implementing Daniels comments. Thanks for catching this!
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1181 to master June 29, 2022 12:43
@openjdk-notifier
Copy link

The dependent pull request 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 goetz_backport_8285696
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Jun 29, 2022
@openjdk openjdk bot added the clean label Jun 29, 2022
@openjdk
Copy link

openjdk bot commented Jun 29, 2022

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

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

8285696: AlgorithmConstraints:permits not throwing IllegalArgumentException when 'alg'  is null

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 29, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jun 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 29, 2022

Going to push as commit 6fe8d8d.

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

openjdk bot commented Jun 29, 2022

@GoeLin Pushed as commit 6fe8d8d.

💡 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_8285696 branch June 29, 2022 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants