Navigation Menu

Skip to content

Commit

Permalink
8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fail…
Browse files Browse the repository at this point in the history
…s because of different openssl output

Reviewed-by: mdoerr, goetz, stuefe
  • Loading branch information
MBaesken committed Dec 13, 2021
1 parent 7c2c585 commit 8b5ff4b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
Expand Up @@ -462,7 +462,7 @@ private static void testWithOpensslCommands(String opensslPath)
"pkcs12", "-in", "ksnormal", "-passin", "pass:changeit",
"-info", "-nokeys", "-nocerts");
output1.shouldHaveExitValue(0)
.shouldContain("MAC: sha256, Iteration 10000")
.shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 10000")
.shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
+ " Iteration 10000, PRF hmacWithSHA256")
.shouldContain("PKCS7 Encrypted data: PBES2, PBKDF2, AES-256-CBC,"
Expand Down Expand Up @@ -505,7 +505,7 @@ private static void testWithOpensslCommands(String opensslPath)
"ksnewic", "-passin", "pass:changeit", "-info", "-nokeys",
"-nocerts");
output1.shouldHaveExitValue(0)
.shouldContain("MAC: sha256, Iteration 5555")
.shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 5555")
.shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
+ " Iteration 7777, PRF hmacWithSHA256")
.shouldContain("Shrouded Keybag: pbeWithSHA1And128BitRC4,"
Expand Down

7 comments on commit 8b5ff4b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8b5ff4b Jan 5, 2022

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch MBaesken-backport-8b5ff4bd in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 8b5ff4bd from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 13 Dec 2021 and was reviewed by Martin Doerr, Goetz Lindenmaier and Thomas Stuefe.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-8b5ff4bd:MBaesken-backport-8b5ff4bd
$ git checkout MBaesken-backport-8b5ff4bd
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-8b5ff4bd

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk18

@openjdk
Copy link

@openjdk openjdk bot commented on 8b5ff4b Jan 10, 2022

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch MBaesken-backport-8b5ff4bd in my personal fork of openjdk/jdk18. To create a pull request with this backport targeting openjdk/jdk18:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 8b5ff4bd from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 13 Dec 2021 and was reviewed by Martin Doerr, Goetz Lindenmaier and Thomas Stuefe.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk18:

$ git fetch https://github.com/openjdk-bots/jdk18 MBaesken-backport-8b5ff4bd:MBaesken-backport-8b5ff4bd
$ git checkout MBaesken-backport-8b5ff4bd
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk18 MBaesken-backport-8b5ff4bd

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8b5ff4b Aug 25, 2022

Choose a reason for hiding this comment

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

@RealCLanger Could not automatically backport 8b5ff4bd to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b RealCLanger-backport-8b5ff4bd

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk 8b5ff4bdffc8f32317d67b00c085071d6c772b30

# Backport the commit
$ git cherry-pick --no-commit 8b5ff4bdffc8f32317d67b00c085071d6c772b30
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 8b5ff4bdffc8f32317d67b00c085071d6c772b30'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 8b5ff4bdffc8f32317d67b00c085071d6c772b30.

Please sign in to comment.