Skip to content

Commit 8b5ff4b

Browse files
committed
8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output
Reviewed-by: mdoerr, goetz, stuefe
1 parent 7c2c585 commit 8b5ff4b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ private static void testWithOpensslCommands(String opensslPath)
462462
"pkcs12", "-in", "ksnormal", "-passin", "pass:changeit",
463463
"-info", "-nokeys", "-nocerts");
464464
output1.shouldHaveExitValue(0)
465-
.shouldContain("MAC: sha256, Iteration 10000")
465+
.shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 10000")
466466
.shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
467467
+ " Iteration 10000, PRF hmacWithSHA256")
468468
.shouldContain("PKCS7 Encrypted data: PBES2, PBKDF2, AES-256-CBC,"
@@ -505,7 +505,7 @@ private static void testWithOpensslCommands(String opensslPath)
505505
"ksnewic", "-passin", "pass:changeit", "-info", "-nokeys",
506506
"-nocerts");
507507
output1.shouldHaveExitValue(0)
508-
.shouldContain("MAC: sha256, Iteration 5555")
508+
.shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 5555")
509509
.shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
510510
+ " Iteration 7777, PRF hmacWithSHA256")
511511
.shouldContain("Shrouded Keybag: pbeWithSHA1And128BitRC4,"

0 commit comments

Comments
 (0)