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

8259223: Simplify boolean expression in the SunJSSE provider #1942

Closed
wants to merge 2 commits into from

Conversation

XueleiFan
Copy link
Member

@XueleiFan XueleiFan commented Jan 5, 2021

There are some boolean expressions that could be improved for better readability in the SunJSSE provider implementation. For example:

- if (cert instanceof X509Certificate == false) { 
+ if (!(cert instanceof X509Certificate)) { 

- return isDTLS ? true : (id >= TLS10.id);
+ return isDTLS || (id >= TLS10.id);

Code cleanup, no new regression test.

Bug: https://bugs.openjdk.java.net/browse/JDK-8259223


Progress

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

Issue

  • JDK-8259223: Simplify boolean expression in the SunJSSE provider

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 5, 2021

👋 Welcome back xuelei! 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 5, 2021
@openjdk
Copy link

openjdk bot commented Jan 5, 2021

@XueleiFan 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, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 5, 2021

Webrevs

@@ -820,7 +820,7 @@ public String getValidator() {
if (!preferred && checkResult == CheckResult.OK && keyIndex == 0) {
preferred = true;
}
if (preferred && (findAll == false)) {
if (preferred && (!findAll)) {
Copy link
Member

Choose a reason for hiding this comment

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

Minor comment - remove the parenthesis around !findAll.

@@ -614,7 +614,7 @@ CheckResult check(X509Certificate cert, Date date,
// exchange and not ephemeral ECDH. We leave it in
// for now until there are signs that this check
// causes problems for real world EC certificates.
if ((this == SERVER) && (getBit(ku, 4) == false)) {
if ((this == SERVER) && (!getBit(ku, 4))) {
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 remove the inner parenthesis around this == SERVER and !getBit(ku, 4), which would make it consistent with the style used on line 584.

@openjdk
Copy link

openjdk bot commented Jan 5, 2021

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

8259223: Simplify boolean expression in the SunJSSE provider

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

  • d5aa49d: 8259236: C2 compilation fails with assert(is_power_of_2(value)) failed: value must be a power of 2: 8000000000000000
  • 82bdbfd: 8258857: Zero: non-PCH release build fails after JDK-8258074
  • f4122d6: 8258896: Remove the JVM ForceFloatExceptions option
  • fc3b45c: 8258643: javax/swing/JComponent/7154030/bug7154030.java failed with "Exception: Failed to hide opaque button"
  • a6c0881: 8256321: Some "inactive" color profiles use the wrong profile class
  • 9f15164: 8259049: Uninitialized variable after JDK-8257513
  • db6f393: 8251944: Add Shenandoah test config to compiler/gcbarriers/UnsafeIntrinsicsTest.java
  • 3817c32: 8258534: Epsilon: clean up unused includes
  • 17d1645: 8258751: Improve ExceptionHandlerTable dump
  • dd8996c: 8258946: Fix optimization-unstable code involving signed integer overflow

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 5, 2021
@XueleiFan
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Jan 5, 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 5, 2021
@openjdk
Copy link

openjdk bot commented Jan 5, 2021

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

  • 1b60acd: 8259252: Shenandoah: Shenandoah build failed on AArch64 after JDK-8258459
  • 7ddc2b5: 8258852: Arrays.asList() for single item could be replaced with List.of()
  • 85bac8c: 8259021: SharedSecrets should avoid double racy reads from non-volatile fields
  • d5aa49d: 8259236: C2 compilation fails with assert(is_power_of_2(value)) failed: value must be a power of 2: 8000000000000000
  • 82bdbfd: 8258857: Zero: non-PCH release build fails after JDK-8258074
  • f4122d6: 8258896: Remove the JVM ForceFloatExceptions option
  • fc3b45c: 8258643: javax/swing/JComponent/7154030/bug7154030.java failed with "Exception: Failed to hide opaque button"
  • a6c0881: 8256321: Some "inactive" color profiles use the wrong profile class
  • 9f15164: 8259049: Uninitialized variable after JDK-8257513
  • db6f393: 8251944: Add Shenandoah test config to compiler/gcbarriers/UnsafeIntrinsicsTest.java
  • ... and 3 more: https://git.openjdk.java.net/jdk/compare/5ea960728c5616373c986ae1343b44043c0db487...master

Your commit was automatically rebased without conflicts.

Pushed as commit 4d3d599.

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

@XueleiFan XueleiFan deleted the JDK-8259223 branch January 5, 2021 19:36
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
2 participants