Skip to content

8285380: Fix typos in security #8340

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

Closed
wants to merge 3 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Apr 21, 2022

I ran codespell on modules owned by the security team (java.security.jgss java.security.sasl java.smartcardio java.xml.crypto jdk.crypto.cryptoki jdk.crypto.ec jdk.crypto.mscapi jdk.security.auth jdk.security.jgss), and accepted those changes where it indeed discovered real typos.

I will update copyright years using a script before pushing (otherwise like every second change would be a copyright update, making reviewing much harder).

The long term goal here is to make tooling support for running codespell. The trouble with automating this is of course all false positives. But before even trying to solve that issue, all true positives must be fixed. Hence this PR.


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8340/head:pull/8340
$ git checkout pull/8340

Update a local copy of the PR:
$ git checkout pull/8340
$ git pull https://git.openjdk.java.net/jdk pull/8340/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8340

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8340.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 21, 2022

👋 Welcome back ihse! 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 8285380 8285380: Fix typos in security Apr 21, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 21, 2022
@openjdk
Copy link

openjdk bot commented Apr 21, 2022

@magicus 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 Apr 21, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 21, 2022

Webrevs

@AlanBateman
Copy link
Contributor

The folks on security-dev will know for sure but I assume that the changes to the imported Apache Santuario code should be dropped as it will make upgrades more complicated.

@magicus
Copy link
Member Author

magicus commented Apr 21, 2022

@AlanBateman So there is even more 3rd party code in there? :-( I tried to ignore fixes for all files that I could identify as 3rd party. It's actually a bit annoying that we have imported source code thrown around like this in the source tree, so there is no clear boundary between code we own and code we import from someone else...

@AlanBateman
Copy link
Contributor

@AlanBateman So there is even more 3rd party code in there? :-( I tried to ignore fixes for all files that I could identify as 3rd party. It's actually a bit annoying that we have imported source code thrown around like this in the source tree, so there is no clear boundary between code we own and code we import from someone else...

security-dev can say for sure but the only 3rd party code I see in this change is in the src/java.xml.crypto/share/classes/com/sun/org/apache tree (the package name gives a hint has it was it was re-packaged).

Copy link
Contributor

@wangweij wangweij 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. Thanks.

@openjdk
Copy link

openjdk bot commented Apr 26, 2022

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

8285380: Fix typos in security

Reviewed-by: weijun, wetmore

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

  • 110edd9: 8284965: closed test sun/java2d/OpenGL/XORPaint.java is unstable
  • dbcf389: 8198666: Many java/awt/Modal/OnTop/ test fails on mac
  • 102a305: 8202790: DnD test DisposeFrameOnDragTest.java does not clean up
  • e3d714d: 8285677: ProblemList two tests from JDK-8285671 on macosx-x64
  • 975a060: 8284642: Unexpected behavior of -XX:MaxDirectMemorySize=0
  • 03bcf7b: 8283620: System.out does not use the encoding/charset specified in the Javadoc
  • 20a132d: 8284994: -Xdoclint:all returns warning for records, even when documented properly
  • a3b7881: 8284930: Re-examine FilterInputStream mark/reset
  • 97a0a29: 8283643: [AIX, testbug] MachCodeFramesInErrorFile test fails to find 'Native frames' text
  • 67755ed: 8284890: Support for Do not fragment IP socket options
  • ... and 48 more: https://git.openjdk.java.net/jdk/compare/fa04d1f832ff201248f935939fa255988053a1d0...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 Apr 26, 2022
Copy link
Contributor

@bradfordwetmore bradfordwetmore left a comment

Choose a reason for hiding this comment

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

LGTM.

@seanjmullan
Copy link
Member

@AlanBateman So there is even more 3rd party code in there? :-( I tried to ignore fixes for all files that I could identify as 3rd party. It's actually a bit annoying that we have imported source code thrown around like this in the source tree, so there is no clear boundary between code we own and code we import from someone else...

security-dev can say for sure but the only 3rd party code I see in this change is in the src/java.xml.crypto/share/classes/com/sun/org/apache tree (the package name gives a hint has it was it was re-packaged).

The src/java.xml.crypto/share/classes/org/jcp tree is also 3rd party Apache code.

However, I am ok with including the spelling fixes for the 3rd-party Apache code (this tree and the one Alan mentions above which you already reverted, but can put it back) with this PR. I am a Committer on the Apache Santuario project so I can push these spelling fixes (they should be non-controversial) to their code base and there won't be any conflicts when we merge up the JDK to the next Santuario release.

@magicus
Copy link
Member Author

magicus commented May 13, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 13, 2022

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

  • 237f280: 8286393: Address possibly lossy conversions in java.rmi
  • cbe7e7b: 8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment
  • 8daf08d: 8286628: Remove unused BufferNode::Allocator::flush_free_list
  • 04df8b7: 8286194: ExecutorShutdown test fails intermittently
  • 0be1f3e: 8286689: (se) Adjusting to select timeout after EINTR messed up after JDK-8286378
  • 6a1b098: 8278039: Code completion not woking after some statements such as "if" or "while"
  • 11fa03f: 8282160: JShell circularly-required classes cannot be defined
  • d5ae383: 8286117: Remove unnecessary indirection and unused code in UL
  • c3bade2: 8286623: Bundle zlib by default with JDK on macos aarch64
  • 617ef54: 8286647: JFR: Build failure when C1 or C2 is disabled after JDK-8282420
  • ... and 318 more: https://git.openjdk.java.net/jdk/compare/fa04d1f832ff201248f935939fa255988053a1d0...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 13, 2022

@magicus Pushed as commit f631c98.

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

@magicus magicus deleted the typos-in-security branch May 23, 2022 09:06
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
Development

Successfully merging this pull request may close these issues.

5 participants