Navigation Menu

Skip to content

Commit

Permalink
8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.…
Browse files Browse the repository at this point in the history
…java after 8278344

Backport-of: 01f93ddf18daea5c0798ac949c6717c37d9cefa0
  • Loading branch information
RealCLanger committed Aug 27, 2022
1 parent 351508c commit c9f3135
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
@@ -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.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -458,7 +458,7 @@ private static void testWithOpensslCommands(String opensslPath)
"pkcs12", "-in", "ksnormal", "-passin", "pass:changeit",
"-info", "-nokeys", "-nocerts");
output1.shouldHaveExitValue(0)
.shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 10000")
.shouldMatch("MAC:.*sha256.*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 @@ -501,7 +501,7 @@ private static void testWithOpensslCommands(String opensslPath)
"ksnewic", "-passin", "pass:changeit", "-info", "-nokeys",
"-nocerts");
output1.shouldHaveExitValue(0)
.shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 5555")
.shouldMatch("MAC:.*sha256.*Iteration 5555")
.shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
+ " Iteration 7777, PRF hmacWithSHA256")
.shouldContain("Shrouded Keybag: pbeWithSHA1And128BitRC4,"
Expand Down

1 comment on commit c9f3135

@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.