Skip to content
Permalink
Browse files
8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fail…
…s because of different openssl output

Backport-of: 8b5ff4bdffc8f32317d67b00c085071d6c772b30
  • Loading branch information
MBaesken committed Jan 25, 2022
1 parent 55fb592 commit 25a418d526d1b8c380fa6230324799957d0b0d3a
Showing 1 changed file with 2 additions and 2 deletions.
@@ -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,"
@@ -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,"

1 comment on commit 25a418d

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 25a418d Jan 25, 2022

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.