Navigation Menu

Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

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

Backport-of: 8b5ff4b
  • Loading branch information
MBaesken committed Jan 10, 2022
1 parent 8f969a1 commit 06b4d49
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

1 comment on commit 06b4d49

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Please sign in to comment.