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

Reviewed-by: weijun
  • Loading branch information
MBaesken committed Jan 4, 2022
1 parent 09cf5f1 commit 9bdf6eb
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 @@ -462,7 +462,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 @@ -505,7 +505,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

3 comments on commit 9bdf6eb

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk18

@openjdk
Copy link

@openjdk openjdk bot commented on 9bdf6eb Jan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MBaesken the backport was successfully created on the branch MBaesken-backport-9bdf6eb7 in my personal fork of openjdk/jdk18. To create a pull request with this backport targeting openjdk/jdk18:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 9bdf6eb7 from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 4 Jan 2022 and was reviewed by Weijun Wang.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk18:

$ git fetch https://github.com/openjdk-bots/jdk18 MBaesken-backport-9bdf6eb7:MBaesken-backport-9bdf6eb7
$ git checkout MBaesken-backport-9bdf6eb7
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk18 MBaesken-backport-9bdf6eb7

Please sign in to comment.