openjdk/jdk18u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk18u.git synced 2025-12-11 12:27:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344

Browse Source 
Reviewed-by: mullan, xuelei
Backport-of: 9bdf6eb7b2412ecff523015f1430dfb6a0e4dd09
This commit is contained in:
Matthias Baesken 2022-02-04 07:47:42 +00:00
parent 2531c332f8
commit 01f93ddf18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -462,7 +462,7 @@ public class KeytoolOpensslInteropTest {
"pkcs12", "-in", "ksnormal", "-passin", "pass:changeit", "pkcs12", "-in", "ksnormal", "-passin", "pass:changeit",
"-info", "-nokeys", "-nocerts"); "-info", "-nokeys", "-nocerts");
output1.shouldHaveExitValue(0) output1.shouldHaveExitValue(0)
.shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 10000") .shouldMatch("MAC:.*sha256.*Iteration 10000")
.shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC," .shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
+ " Iteration 10000, PRF hmacWithSHA256") + " Iteration 10000, PRF hmacWithSHA256")
.shouldContain("PKCS7 Encrypted data: PBES2, PBKDF2, AES-256-CBC," .shouldContain("PKCS7 Encrypted data: PBES2, PBKDF2, AES-256-CBC,"
@ -505,7 +505,7 @@ public class KeytoolOpensslInteropTest {
"ksnewic", "-passin", "pass:changeit", "-info", "-nokeys", "ksnewic", "-passin", "pass:changeit", "-info", "-nokeys",
"-nocerts"); "-nocerts");
output1.shouldHaveExitValue(0) output1.shouldHaveExitValue(0)
.shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 5555") .shouldMatch("MAC:.*sha256.*Iteration 5555")
.shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC," .shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
+ " Iteration 7777, PRF hmacWithSHA256") + " Iteration 7777, PRF hmacWithSHA256")
.shouldContain("Shrouded Keybag: pbeWithSHA1And128BitRC4," .shouldContain("Shrouded Keybag: pbeWithSHA1And128BitRC4,"