8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java #376

jmtd · 2021-09-20T09:46:33Z

Hello,

This pull request is a backport of commit openjdk/jdk@ed57cf1 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), 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)

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java

Reviewers

Goetz Lindenmaier (@GoeLin - Reviewer) ⚠️ Review applies to a639942
Christoph Langer (@RealCLanger - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/376/head:pull/376
$ git checkout pull/376

Update a local copy of the PR:
$ git checkout pull/376
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/376/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 376

View PR using the GUI difftool:
$ git pr show -t 376

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/376.diff

bridgekeeper · 2021-09-20T09:47:53Z

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-09-20T12:37:15Z

This backport pull request has now been updated with issue from the original commit.

mlbridge · 2021-09-20T13:30:22Z

Webrevs

mlbridge · 2021-09-20T15:15:15Z

Mailing list message from Jonathan Dowland on jdk-updates-dev:

Hi folks,

after 8266182 is merged, in theory JDK-8272581 should be considered very
shortly afterwards

https://bugs.openjdk.java.net/browse/JDK-8272581
"sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182"

Upstream, merging 8266182 broke MultipleLogins.sh, and 8272581 fixes it.

In my testing for jdk11u-dev, however, MultipleLogins.sh passes both
prior to and after merging 8266182. So strictly I don't think 8272581
needs to be backported to 11u, except that the test *should* have
broke, and something else is amiss.

--
???? Jonathan Dowland <jdowland at redhat.com>
Senior Software Engineer, OpenJDK, Red Hat

GoeLin

LGTM, thanks for downporting!

openjdk · 2021-09-21T06:16:08Z

@jmtd This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java

Reviewed-by: goetz, clanger

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 11 new commits pushed to the master branch:

28dec4f: 8223139: Rename mandatory policy-do routines.
e1cbfa5: 8248187: [TESTBUG] javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java fails with String is not properly drawn
6a784d2: 8143021: [TEST_BUG] Test javax/swing/JColorChooser/Test6541987.java fails
09ad2c0: 8256152: tests fail because of ambiguous method resolution
2990ff0: 8211171: move JarUtils to top-level testlibrary
f7a75de: 8265524: Upgrading JSZip from v3.2.2 to v3.6.0
9f8c13c: 8233569: [TESTBUG] JTextComponent test bug6361367.java fails on macos
a6ee356: 8234823: java/net/Socket/Timeouts.java testcase testTimedConnect2() fails on Windows 10
23c3845: 8229935: [TEST_BUG]: bug8132119.java inconsistently positions text
ed98060: 8223137: Rename predicate 'do_unroll_only()' to 'is_unroll_only()'.
... and 1 more: https://git.openjdk.java.net/jdk11u-dev/compare/b9f01439e9277be2b990ed3bfc513a05651c3c29...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@GoeLin, @RealCLanger) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

RealCLanger · 2021-09-21T07:16:03Z

Hi, we tested the PR and looks like we're seeing failures in these tests because OpensslArtifactFetcher.java does not compile:
sun/security/pkcs11/Provider/ConfigQuotedString.sh
sun/security/pkcs11/Provider/Login.sh

jmtd · 2021-09-21T10:46:56Z

@RealCLanger thanks for catching these.
Both of those shell script tests are rewritten to Java tests in https://bugs.openjdk.java.net/browse/JDK-8180571 , which was backported to 11.0.13-oracle. I'll see if backporting resolves this issue.

jmtd · 2021-09-21T12:54:01Z

I've taken a look at JDK-8180571 which is in scope for backporting and will resolve this issue by deleting those two shell tests, however it's not a trivial backport. In the meantime I've force-pushed the following two line fix to those shell tests for 8266182. This gets them passing again. Please let me know what you think.

--- a/test/jdk/sun/security/pkcs11/Provider/ConfigQuotedString.sh
+++ b/test/jdk/sun/security/pkcs11/Provider/ConfigQuotedString.sh
@@ -104,7 +104,7 @@ esac
 # compile test
 
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-        -classpath ${TESTSRC}${FS}.. \
+        -classpath ${TESTSRC}${FS}..${PS}${TESTSRC}${FS}..${FS}..${FS}..${FS}..${FS}..${FS}lib \
         -d ${TESTCLASSES} \
         ${TESTSRC}${FS}..${FS}..${FS}..${FS}..${FS}..${FS}lib${FS}jdk${FS}test${FS}lib${FS}artifacts${FS}*.java \
         ${TESTSRC}${FS}ConfigQuotedString.java \
diff --git a/test/jdk/sun/security/pkcs11/Provider/Login.sh b/test/jdk/sun/security/pkcs11/Provider/Login.sh
index 53be7bb61e7..2f942d66ce9 100644
--- a/test/jdk/sun/security/pkcs11/Provider/Login.sh
+++ b/test/jdk/sun/security/pkcs11/Provider/Login.sh
@@ -113,7 +113,7 @@ ${CHMOD} +w ${TESTCLASSES}${FS}key3.db
 # compile test
 
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-        -classpath ${TESTSRC}${FS}.. \
+        -classpath ${TESTSRC}${FS}..${PS}${TESTSRC}${FS}..${FS}..${FS}..${FS}..${FS}..${FS}lib \
         -d ${TESTCLASSES} \
         ${TESTSRC}${FS}..${FS}..${FS}..${FS}..${FS}..${FS}lib${FS}jdk${FS}test${FS}lib${FS}artifacts${FS}*.java \
         ${TESTSRC}${FS}Login.java \

RealCLanger · 2021-09-22T08:18:40Z

I would prefer if JDK-8180571 could be backported first. It was done for 11.0.13-oracle anyway, so we should get to it soon. Let's defer this one until after the JDK-8180571 backport.

jmtd · 2021-09-22T11:00:32Z

@RealCLanger:

I would prefer if JDK-8180571 could be backported first. It was done for 11.0.13-oracle anyway, so we should get to it soon. Let's defer this one until after the JDK-8180571 backport.

Sure ok. I've started work on that one.

RealCLanger · 2021-09-30T11:00:10Z

@jmtd Now, after JDK-8180571 was merged, is this one good to go as well? Does it need rebasing?

jmtd · 2021-09-30T11:05:16Z

@jmtd Now, after JDK-8180571 was merged, is this one good to go as well? Does it need rebasing?

I think rebasing is necessary, yes: I've just pushed a rebase.

jmtd · 2021-09-30T11:39:12Z

GHA tests re-running of course but in the meantime I ran jtreg on the tests this patch touches as well as 8180571, 7/7 passed.

RealCLanger

OK, I found a small nit. There's one bug id that shouldn't be mentioned in 11. Other than that, I'll run it through SAP's testing tonight and will let you know the results tomorrow.

test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java

RealCLanger

Looks good. SAP tests show no regressions.

jmtd · 2021-10-02T07:50:27Z

/integrate

RealCLanger · 2021-10-02T08:03:54Z

/sponsor

openjdk · 2021-10-04T07:13:02Z

@jmtd
Your change (at version a560f63) is now ready to be sponsored by a Committer.

openjdk · 2021-10-04T07:15:36Z

Going to push as commit f12af7e.
Since your change was applied there have been 11 commits pushed to the master branch:

28dec4f: 8223139: Rename mandatory policy-do routines.
e1cbfa5: 8248187: [TESTBUG] javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java fails with String is not properly drawn
6a784d2: 8143021: [TEST_BUG] Test javax/swing/JColorChooser/Test6541987.java fails
09ad2c0: 8256152: tests fail because of ambiguous method resolution
2990ff0: 8211171: move JarUtils to top-level testlibrary
f7a75de: 8265524: Upgrading JSZip from v3.2.2 to v3.6.0
9f8c13c: 8233569: [TESTBUG] JTextComponent test bug6361367.java fails on macos
a6ee356: 8234823: java/net/Socket/Timeouts.java testcase testTimedConnect2() fails on Windows 10
23c3845: 8229935: [TEST_BUG]: bug8132119.java inconsistently positions text
ed98060: 8223137: Rename predicate 'do_unroll_only()' to 'is_unroll_only()'.
... and 1 more: https://git.openjdk.java.net/jdk11u-dev/compare/b9f01439e9277be2b990ed3bfc513a05651c3c29...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-10-04T07:16:00Z

@RealCLanger @jmtd Pushed as commit f12af7e.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

jmtd changed the title ~~Backport 9248bd08cf6d16aca27ea1b00506736fc0544070~~ Backport ed57cf1cf3f2d107e085ecdae38a63e66ab2fa30 Sep 20, 2021

openjdk bot changed the title ~~Backport ed57cf1cf3f2d107e085ecdae38a63e66ab2fa30~~ 8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java Sep 20, 2021

openjdk bot added backport rfr labels Sep 20, 2021

GoeLin approved these changes Sep 21, 2021

View reviewed changes

openjdk bot added the ready label Sep 21, 2021

jmtd force-pushed the 8266182 branch from a639942 to b165ab9 Compare September 21, 2021 12:52

jmtd force-pushed the 8266182 branch 2 times, most recently from a639942 to f6eb0b7 Compare September 23, 2021 08:35

jmtd mentioned this pull request Sep 23, 2021

8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182 #400

Closed

3 tasks

jmtd force-pushed the 8266182 branch from f6eb0b7 to 697f1d4 Compare September 30, 2021 11:05

RealCLanger suggested changes Sep 30, 2021

View reviewed changes

test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java Outdated Show resolved Hide resolved

Backport ed57cf1cf3f2d107e085ecdae38a63e66ab2fa30

a560f63

jmtd force-pushed the 8266182 branch from 697f1d4 to a560f63 Compare September 30, 2021 12:43

RealCLanger approved these changes Oct 1, 2021

View reviewed changes

openjdk bot added the sponsor label Oct 4, 2021

openjdk bot closed this Oct 4, 2021

openjdk bot added integrated and removed ready rfr sponsor labels Oct 4, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java #376

8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java #376

jmtd commented Sep 20, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Sep 20, 2021

openjdk bot commented Sep 20, 2021

mlbridge bot commented Sep 20, 2021 •

edited

Loading

mlbridge bot commented Sep 20, 2021

GoeLin left a comment

openjdk bot commented Sep 21, 2021 •

edited

Loading

RealCLanger commented Sep 21, 2021 •

edited

Loading

jmtd commented Sep 21, 2021

jmtd commented Sep 21, 2021

RealCLanger commented Sep 22, 2021

jmtd commented Sep 22, 2021

RealCLanger commented Sep 30, 2021

jmtd commented Sep 30, 2021

jmtd commented Sep 30, 2021

RealCLanger left a comment

RealCLanger left a comment

jmtd commented Oct 2, 2021

RealCLanger commented Oct 2, 2021

openjdk bot commented Oct 4, 2021

openjdk bot commented Oct 4, 2021

openjdk bot commented Oct 4, 2021

8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java #376

8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java #376

Conversation

jmtd commented Sep 20, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Sep 20, 2021

openjdk bot commented Sep 20, 2021

mlbridge bot commented Sep 20, 2021 • edited Loading

Webrevs

mlbridge bot commented Sep 20, 2021

GoeLin left a comment

Choose a reason for hiding this comment

openjdk bot commented Sep 21, 2021 • edited Loading

RealCLanger commented Sep 21, 2021 • edited Loading

jmtd commented Sep 21, 2021

jmtd commented Sep 21, 2021

RealCLanger commented Sep 22, 2021

jmtd commented Sep 22, 2021

RealCLanger commented Sep 30, 2021

jmtd commented Sep 30, 2021

jmtd commented Sep 30, 2021

RealCLanger left a comment

Choose a reason for hiding this comment

RealCLanger left a comment

Choose a reason for hiding this comment

jmtd commented Oct 2, 2021

RealCLanger commented Oct 2, 2021

openjdk bot commented Oct 4, 2021

openjdk bot commented Oct 4, 2021

openjdk bot commented Oct 4, 2021

jmtd commented Sep 20, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 20, 2021 •

edited

Loading

openjdk bot commented Sep 21, 2021 •

edited

Loading

RealCLanger commented Sep 21, 2021 •

edited

Loading