8264681: Use the blessed modifier order in java.security #3338

alblue · 2021-04-03T22:09:55Z

Progress

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

Issue

JDK-8264681: Use the blessed modifier order in java.security

Reviewers

Sean Mullan (@seanjmullan - Reviewer) ⚠️ Review applies to d91bdba
Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3338/head:pull/3338
$ git checkout pull/3338

Update a local copy of the PR:
$ git checkout pull/3338
$ git pull https://git.openjdk.java.net/jdk pull/3338/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3338

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3338.diff

bridgekeeper · 2021-04-03T22:10:50Z

👋 Welcome back alblue! 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-04-03T22:12:36Z

@alblue The following label will be automatically applied to this pull request:

security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-04-03T22:17:51Z

Webrevs

01: Full - Incremental (3e9047f7)
00: Full (d91bdba9)

seanjmullan

The rest looks fine, but I would double-check all the copyrights to see if you are modifying any other 3rd-party code than the ones I commented on. Best to leave that code as-is and fix it at the source, if possible.

seanjmullan · 2021-04-08T16:59:50Z

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Constants.java

@@ -50,7 +50,7 @@


 /**
- * This class holds only final static member variables that are constants
+ * This class holds only static final member variables that are constants


Probably best to leave this file unchanged as it is 3rd-party code.

Same here...

seanjmullan · 2021-04-08T17:02:20Z

src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java

@@ -387,7 +387,7 @@ private static void checkKeySize(XMLCryptoContext context, Key key)
            super(dmElem);
        }

-        abstract public PSSParameterSpec getPSSParameterSpec();
+        public abstract PSSParameterSpec getPSSParameterSpec();


This is 3rd-party (Apache) code. It would be better to change this at Apache. I would leave this one out.

@alblue, this is the unresolved comment. Please fix it?

openjdk · 2021-04-08T21:21:54Z

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8264681: Use the blessed modifier order in java.security

Reviewed-by: mullan, shade

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 111 new commits pushed to the master branch:

784f1c1: 8264200: java/nio/channels/DatagramChannel/SRTest.java fails intermittently
a4f644e: 8265064: Move clearing and setting of members into helpers in ReservedSpace
7006070: 8265061: Simplify MethodHandleNatives::canBeCalledVirtual
1935655: 8264957: Cleanup unused array Type::dual_type
954b9a1: 8264795: IGV: Upgrade NetBeans platform
f2f7aa3: 8262291: Refactor reserve_memory_special_huge_tlbfs
008fc75: 8264224: Add macosx-aarch64 to Oracle build configurations
f4e6395: 8264190: Harden TLS interop tests
18bec9c: 8265084: [BACKOUT] 8264954: unified handling for VectorMask object re-materialization during de-optimization
9dd9625: 8263763: Synthetic constructor parameters of enum are not considered for annotation indices
... and 101 more: https://git.openjdk.java.net/jdk/compare/f259eeaf65cbbd360e96f8c102653feb636eb899...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 (@seanjmullan, @shipilev) 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).

alblue · 2021-04-10T15:06:49Z

/integrate

openjdk · 2021-04-10T15:08:07Z

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

shipilev

I think some review comments from Sean were left unaddressed...

shipilev · 2021-04-12T06:14:12Z

src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java

@@ -387,7 +387,7 @@ private static void checkKeySize(XMLCryptoContext context, Key key)
            super(dmElem);
        }

-        abstract public PSSParameterSpec getPSSParameterSpec();
+        public abstract PSSParameterSpec getPSSParameterSpec();


@alblue, this is the unresolved comment. Please fix it?

shipilev · 2021-04-12T06:14:57Z

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/Constants.java

@@ -50,7 +50,7 @@


 /**
- * This class holds only final static member variables that are constants
+ * This class holds only static final member variables that are constants


Same here...

alblue · 2021-04-12T09:17:36Z

Sorry, thought those changes had been removed. Let me fix.

alblue · 2021-04-12T10:12:06Z

Did a search of the files included in the commit, didn't see anything other than the two above without the standard Oracle copyright .

Wasn't sure about src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java though; it has an Oracle copyright on it (and not the 'do not alter') one. Should I remove that one from this commit as well?

seanjmullan · 2021-04-12T15:31:22Z

Did a search of the files included in the commit, didn't see anything other than the two above without the standard Oracle copyright .

Wasn't sure about src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java though; it has an Oracle copyright on it (and not the 'do not alter') one. Should I remove that one from this commit as well?

This one should be ok. We have already made changes to this file so preserving pure parity with the 3rd party sources is not an overriding concern.

alblue · 2021-04-13T13:40:06Z

What happens to this now? Do I need to wait for a re-review of the change or do I hit the (slash) integrate command now?

shipilev

I think all conversations have been resolved, we can integrate.

alblue · 2021-04-13T15:00:26Z

/integrate

openjdk · 2021-04-13T15:01:39Z

@alblue
Your change (at version 3e9047f) is now ready to be sponsored by a Committer.

shipilev · 2021-04-14T05:59:48Z

/sponsor

openjdk · 2021-04-14T06:01:24Z

@shipilev @alblue Since your change was applied there have been 125 commits pushed to the master branch:

ea5c55a: 8265103: Remove unnecessary inclusion of oopMap.hpp
26186ec: 8039261: [TEST_BUG]: There is not a minimal security level in Java Preferences and the TestApplet.html is blocked.
283d64f: 8262896: [macos_aarch64] Crash in jni_fast_GetLongField
55d5649: 8263157: [macos]: java.library.path is being set incorrectly
e80012e: 8264768: JFR: Allow events to be printed to the log
3b576ed: 8265100: (fs) WindowsFileStore.hashCode() should read cached hash code once
8df8512: 8265125: IGV: cannot edit forms with NetBeans GUI builder
9cd5400: 8265138: Simplify DerUtils::checkAlg
c797511: 8264940: java/lang/invoke/6998541/Test6998541.java failed "guarantee(ik->is_initialized()) failed: java/lang/Byte$ByteCache must be initialized"
943503e: 8265035: Remove unneeded exception check from refill_ic_stubs()
... and 115 more: https://git.openjdk.java.net/jdk/compare/f259eeaf65cbbd360e96f8c102653feb636eb899...master

Your commit was automatically rebased without conflicts.

Pushed as commit ebbce91.

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

8264681: Use the blessed modifier order in java.security

d91bdba

openjdk bot added security security-dev@openjdk.org rfr Pull request is ready for review labels Apr 3, 2021

seanjmullan approved these changes Apr 8, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 8, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 10, 2021

shipilev suggested changes Apr 12, 2021

View reviewed changes

Removed upstream licensed code from commit

3e9047f

openjdk bot removed the sponsor Pull request is ready to be sponsored label Apr 12, 2021

shipilev approved these changes Apr 13, 2021

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 13, 2021

openjdk bot closed this Apr 14, 2021

openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 14, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8264681: Use the blessed modifier order in java.security #3338

8264681: Use the blessed modifier order in java.security #3338

alblue commented Apr 3, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Apr 3, 2021

openjdk bot commented Apr 3, 2021

mlbridge bot commented Apr 3, 2021 •

edited

Loading

seanjmullan left a comment

seanjmullan Apr 8, 2021

shipilev Apr 12, 2021

seanjmullan Apr 8, 2021

shipilev Apr 12, 2021

openjdk bot commented Apr 8, 2021 •

edited

Loading

alblue commented Apr 10, 2021

openjdk bot commented Apr 10, 2021

shipilev left a comment

shipilev Apr 12, 2021

shipilev Apr 12, 2021

alblue commented Apr 12, 2021

alblue commented Apr 12, 2021

seanjmullan commented Apr 12, 2021

alblue commented Apr 13, 2021

shipilev left a comment

alblue commented Apr 13, 2021

openjdk bot commented Apr 13, 2021

shipilev commented Apr 14, 2021

openjdk bot commented Apr 14, 2021

8264681: Use the blessed modifier order in java.security #3338

8264681: Use the blessed modifier order in java.security #3338

Conversation

alblue commented Apr 3, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Apr 3, 2021

openjdk bot commented Apr 3, 2021

mlbridge bot commented Apr 3, 2021 • edited Loading

Webrevs

seanjmullan left a comment

Choose a reason for hiding this comment

seanjmullan Apr 8, 2021

Choose a reason for hiding this comment

shipilev Apr 12, 2021

Choose a reason for hiding this comment

seanjmullan Apr 8, 2021

Choose a reason for hiding this comment

shipilev Apr 12, 2021

Choose a reason for hiding this comment

openjdk bot commented Apr 8, 2021 • edited Loading

alblue commented Apr 10, 2021

openjdk bot commented Apr 10, 2021

shipilev left a comment

Choose a reason for hiding this comment

shipilev Apr 12, 2021

Choose a reason for hiding this comment

shipilev Apr 12, 2021

Choose a reason for hiding this comment

alblue commented Apr 12, 2021

alblue commented Apr 12, 2021

seanjmullan commented Apr 12, 2021

alblue commented Apr 13, 2021

shipilev left a comment

Choose a reason for hiding this comment

alblue commented Apr 13, 2021

openjdk bot commented Apr 13, 2021

shipilev commented Apr 14, 2021

openjdk bot commented Apr 14, 2021

alblue commented Apr 3, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Apr 3, 2021 •

edited

Loading

openjdk bot commented Apr 8, 2021 •

edited

Loading