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

8294734: Redundant override in AES implementation #10545

Closed
wants to merge 1 commit into from

Conversation

XueleiFan
Copy link
Member

@XueleiFan XueleiFan commented Oct 3, 2022

Hi,

May I have this simple code clean-up patch reviewed?

In the AES cipher implementation, the override of engineDoFinal() method in the following code is not necessary as it only calls super. The throws descriptions are missed in the method description. It may be better to remove this override implementation, rather than fix the method description.

    /**
     * Finalize crypto operation with ByteBuffers
     *
     * @param input the input ByteBuffer
     * @param output the output ByteBuffer
     *
     * @return output length
     * @throws ShortBufferException
     * @throws IllegalBlockSizeException
     * @throws BadPaddingException
     */
    protected int engineDoFinal(ByteBuffer input, ByteBuffer output)
        throws ShortBufferException, IllegalBlockSizeException,
        BadPaddingException {
        return super.engineDoFinal(input, output);
    }

Code clean-up, not new regression test added.

Thanks,
Xuelei


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-8294734: Redundant override in AES implementation

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10545/head:pull/10545
$ git checkout pull/10545

Update a local copy of the PR:
$ git checkout pull/10545
$ git pull https://git.openjdk.org/jdk pull/10545/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10545

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10545.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 3, 2022

👋 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 Oct 3, 2022
@openjdk
Copy link

openjdk bot commented Oct 3, 2022

@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 Oct 3, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 3, 2022

Webrevs

Copy link

@valeriepeng valeriepeng left a comment

Choose a reason for hiding this comment

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

Thanks for the clean up.

@openjdk
Copy link

openjdk bot commented Oct 4, 2022

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

8294734: Redundant override in AES implementation

Reviewed-by: valeriep, 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 19 new commits pushed to the master branch:

  • b2e86a6: 8294255: Add link to DEFAULT_WAIT_TIME in javadoc for SunToolKit.realsSync
  • b22a38d: 8292309: Fix java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java test
  • 121d4a5: 8293579: tools/jpackage/share/jdk/jpackage/tests/UnicodeArgsTest.java fails on Japanese Windows platform
  • 1166a8a: 8292214: Memory leak in getAllConfigs of awt_GraphicsEnv.c:386
  • 3644e26: 8294673: JFR: Add SecurityProviderService#threshold to TestActiveSettingEvent.java
  • 085949a: 8294712: G1: Use index-base iteration for G1FlushHumongousCandidateRemSets
  • b850f05: 8294758: JFR: Docs build fails after changes to RecordedObject and Timespan
  • 2dbedf0: 8294406: Test runtime/handshake/HandshakeDirectTest.java failed: JVMTI_ERROR_WRONG_PHASE
  • 4d6668e: 8294242: JFR: jfr print doesn't handle infinite duration well
  • 5a9cd33: 8294509: The sign extension bug applies to 'public static int[] convertSeedBytesToInts(byte[] seed, int n, int z)' in RandomSupport
  • ... and 9 more: https://git.openjdk.org/jdk/compare/081691adf42919237b2a5b71a4b1064c7112a79c...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 Oct 4, 2022
@XueleiFan
Copy link
Member Author

Thanks for the clean up.

Thank you for the review.

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.

I'm definitely guilty of not taking the time to beautify the method/exception description from the superclass.

@XueleiFan
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 5, 2022

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

  • 536c9a5: 8294618: Update openjdk.java.net => openjdk.org
  • f531dae: 8294840: langtools OptionalDependencyTest.java use File.pathSeparator
  • ee6c391: 8289925: Shared code shouldn't reference the platform specific method frame::interpreter_frame_last_sp()
  • bd90c4c: 8282900: runtime/stringtable/StringTableCleaningTest.java verify unavailable at this moment
  • 979efd4: 8289004: investigate if SharedRuntime::get_java_tid parameter should be a JavaThread*
  • b9eeec2: 8294310: compare.sh fails on macos after JDK-8293550
  • 13a5000: 8294151: JFR: Unclear exception message when dumping stopped in memory recording
  • 8ebebbc: 8294368: Java incremental builds broken on Windows after JDK-8293116
  • 4bdd1c9: 8290964: C2 compilation fails with assert "non-reduction loop contains reduction nodes"
  • b4e74ae: 8294514: Wrong initialization of nmethod::_consts_offset for native nmethods
  • ... and 24 more: https://git.openjdk.org/jdk/compare/081691adf42919237b2a5b71a4b1064c7112a79c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 5, 2022

@XueleiFan Pushed as commit f2c5718.

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

@XueleiFan XueleiFan deleted the JDK-8294734 branch October 5, 2022 17:37
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
3 participants