[jdk11u-dev] RFR: 8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java

Jonathan Dowland jdowland at openjdk.java.net
Mon Sep 20 13:30:24 UTC 2021


Hello,

This pull request is a backport of commit https://github.com/openjdk/jdk/commit/ed57cf1cf3f2d107e085ecdae38a63e66ab2fa30 from openjdk/jdk,
authored by Abdul Kolarkunnu and reviewed by hchao, ssahoo, xuelei, weijun.

The backport is not clean: 11u differs from newer JDKs in keytool defaults (see [JDK-8267599](https://bugs.openjdk.java.net/browse/JDK-8267599)), and the test needed adjusting to account for this in two places: 


--- a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
+++ b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
@@ -456,7 +456,7 @@ public class KeytoolOpensslInteropTest {
                 "pkcs12", "-in", "ksnormal", "-passin", "pass:changeit",
                 "-info", "-nokeys", "-nocerts");
         output1.shouldHaveExitValue(0)
-            .shouldContain("MAC: sha256, Iteration 10000")
+            .shouldContain("MAC: sha1, Iteration 100000")
             .shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
                     + " Iteration 10000, PRF hmacWithSHA256")
             .shouldContain("PKCS7 Encrypted data: PBES2, PBKDF2, AES-256-CBC,"
@@ -499,7 +499,7 @@ public class KeytoolOpensslInteropTest {
                 "ksnewic", "-passin", "pass:changeit", "-info", "-nokeys",
                 "-nocerts");
         output1.shouldHaveExitValue(0)
-            .shouldContain("MAC: sha256, Iteration 5555")
+            .shouldContain("MAC: sha1, Iteration 5555")
             .shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
                     + " Iteration 7777, PRF hmacWithSHA256")
             .shouldContain("Shrouded Keybag: pbeWithSHA1And128BitRC4,"


The test in this PR passes for 11u.

(I will immediately begin on the related backport [JDK-8272581](https://bugs.openjdk.java.net/browse/JDK-8272581))

-------------

Commit messages:
 - Backport ed57cf1cf3f2d107e085ecdae38a63e66ab2fa30

Changes: https://git.openjdk.java.net/jdk11u-dev/pull/376/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk11u-dev&pr=376&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8266182
  Stats: 1172 lines in 3 files changed: 725 ins; 447 del; 0 mod
  Patch: https://git.openjdk.java.net/jdk11u-dev/pull/376.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk11u-dev pull/376/head:pull/376

PR: https://git.openjdk.java.net/jdk11u-dev/pull/376


More information about the jdk-updates-dev mailing list