infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-02 14:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Backport-of: 8b5ff4bdffc8f32317d67b00c085071d6c772b30
This commit is contained in:
Matthias Baesken 2022-01-10 11:41:14 +00:00
parent 8f969a1362
commit 06b4d494bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
View File

@ -462,7 +462,7 @@ public class KeytoolOpensslInteropTest {
"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 @@ public class KeytoolOpensslInteropTest {
"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,"