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

JDK-8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output #6779

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Dec 9, 2021

Please review this small test fix.
KeytoolOpensslInteropTest.java fails with the output below.
Seems on our SUSE Linux 15 (openssl is
~> openssl version
OpenSSL 1.1.0i-fips 14 Aug 2018
) we get a slightly different output with a blank missing after "MAC:" :

:stdErr:
Mon Dec 06 21:54:48 CET 2021
stdout: [];
stderr: [MAC:sha256 Iteration 10000
. . .
java.lang.RuntimeException: 'MAC: sha256, Iteration 10000' missing from stdout/stderr

So it is necessary to adjust the test to the other openssl version.


Progress

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

Issue

  • JDK-8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6779

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 9, 2021

👋 Welcome back mbaesken! 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 label Dec 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

@MBaesken 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 label Dec 9, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 9, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM.

@openjdk
Copy link

@openjdk openjdk bot commented Dec 10, 2021

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

8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output

Reviewed-by: mdoerr, goetz, stuefe

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 77 new commits pushed to 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 label Dec 10, 2021
@MBaesken
Copy link
Member Author

@MBaesken MBaesken commented Dec 10, 2021

LGTM.

Hi Martin, thanks for the review.

GoeLin
GoeLin approved these changes Dec 10, 2021
Copy link
Member

@GoeLin GoeLin left a comment

All good, simple fix.

Copy link
Member

@tstuefe tstuefe left a comment

All good.

@MBaesken
Copy link
Member Author

@MBaesken MBaesken commented Dec 13, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 13, 2021

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

  • 7c2c585: 8276819: javax/print/PrintServiceLookup/FlushCustomClassLoader.java fails to free
  • db68a0c: 8276766: Enable jar and jmod to produce deterministic timestamped content
  • 6eb6ec0: 8278525: Additional -Wnonnull errors happen with GCC 11
  • 81c56c7: 8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing.
  • 61736f8: Merge
  • 0602f4c: 8277621: ARM32: multiple fastdebug failures with "bad AD file" after JDK-8276162
  • 3df8dc4: 8278538: Test langtools/jdk/javadoc/tool/CheckManPageOptions.java fails after the manpage was updated
  • ed5d53a: 8273179: Update nroff pages in JDK 18 before RC
  • afd065b: 8278415: [TESTBUG] vmTestbase/nsk/stress/stack/stack018.java fails with "java.lang.Error: TEST_RFE"
  • 4f594e6: 8278381: [GCC 11] Address::make_raw() does not initialize rspec
  • ... and 76 more: https://git.openjdk.java.net/jdk/compare/44fcee3830466e34656ea553d10a60fc382c85a6...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 13, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 13, 2021

@MBaesken Pushed as commit 8b5ff4b.

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

@wangweij
Copy link
Contributor

@wangweij wangweij commented Dec 13, 2021

Sorry about the late comment, but the updated code would allow those 3 strings appearing on different lines. Maybe a shouldMatch can be more precise.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated security
5 participants