8153005: Upgrade the default PKCS12 encryption/MAC algorithms #473

wangweij · 2020-10-01T20:02:34Z

Default algorithms are bumped to be based on PBES2 with AES-256 and SHA-256. Please also review the CSR at https://bugs.openjdk.java.net/browse/JDK-8228481.

Progress

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

Testing

	Linux x32	Linux x64	Windows x64	macOS x64
Build	⏳ (1/1 running)	⏳ (5/5 running)	⏳ (2/2 running)	⏳ (2/2 running)

Issue

JDK-8153005: Upgrade the default PKCS12 encryption/MAC algorithms

Reviewers

Sean Mullan (@seanjmullan - Reviewer) ⚠️ Review applies to 41be78a

Download

$ git fetch https://git.openjdk.java.net/jdk pull/473/head:pull/473
$ git checkout pull/473

The text was updated successfully, but these errors were encountered:

bridgekeeper · 2020-10-01T20:04:31Z

👋 Welcome back weijun! 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 · 2020-10-01T20:05:39Z

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

wangweij · 2020-10-01T20:06:04Z

TBD: We bumped iteration counts for PBE and HMAC to 50000 and 100000 when we were using weak algorithms. Now that the algorithms are strong, we can consider lower them. Currently, openssl 3.0.0 uses 2048 and Windows Server 2019 uses 2000.

mlbridge · 2020-10-01T20:09:15Z

Webrevs

seanjmullan · 2020-10-02T18:45:07Z

test/jdk/sun/security/mscapi/VeryLongAlias.java

@@ -48,7 +48,11 @@

    public static void main(String[] args) throws Throwable {

-        SecurityTools.keytool("-genkeypair -storetype pkcs12 -keystore ks"
+        // Using the old algorithms to make sure the file is recognized


Do we also want to have a test that uses the new algorithms?

I only know Windows Server 2019 can accept the new algorithms.

Ok, but maybe we can split this test in two and use the jtreg @requires tag to run the newer algorithms on Windows Server 2019? It would be a useful test if this is the only test where we test PKCS12 interop with Windows.

OK. Or I can see if there is an existing method in test/lib that can detects the version.

seanjmullan · 2020-10-02T18:48:43Z

test/lib/jdk/test/lib/security/DerUtils.java

@@ -1,5 +1,5 @@
 /*


Is this test change supposed to be a part of this fix?

Yes, the change simplifies checkAlg calls so they don't need to convert KnownOIDs or String to ObjectIdentifier first.

haimaychao

Looks good. Only minor comments.

haimaychao · 2020-10-07T22:08:19Z

src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java

+    private static final String DEFAULT_KEY_PBE_ALGORITHM
+            = "PBEWithHmacSHA256AndAES_256";
+    private static final String DEFAULT_MAC_ALGORITHM = "HmacPBESHA256";
+    private static final int DEFAULT_PBE_ITERATION_COUNT = 50000;


As we have keystore.pkcs12.certPbeIterationCount and keystore.pkcs12.keyPbeIterationCount, I would like to suggest that we can define DEFAULT_CERT_PBE_ITERATION_COUNT and DEFAULT_KEY_PBE_ITERATION_COUNT, specifying each of the values for finer granularity. Same for LEGACY_PBE_ITERATION_COUNT.

haimaychao · 2020-10-07T22:08:19Z

test/jdk/sun/security/mscapi/VeryLongAlias.java

@@ -48,7 +48,11 @@



Add bug number to @bug.

haimaychao · 2020-10-07T22:20:07Z

CSR looks good. In "Sepcification" section: a typo in 'Thr iteration counts used by'. At the end, it describes the new system property will override the security properties and use the older and weaker algorithms, so suggest we could also add text about setting the iteration counts to the default legacy values.

wangweij · 2020-10-07T22:49:09Z

CSR updated. More description, and iteration counts lowered to 10000. Will update code soon.

wangweij · 2020-10-08T14:21:09Z

New commit updating ic to 10000. I also created separate constants for DEFAULT_CERT_PBE_ITERATION_COUNT and DEFAULT_KEY_PBE_ITERATION_COUNT. I haven't made the change for LEGACY_PBE_ITERATION_COUNT since they will never change.

seanjmullan · 2020-10-08T16:34:59Z

Are you still planning, or is it possible to add a test for Windows 2019? Also, have you considered adding a test that checks if the JDK can read OpenSSL PKCS#12 files and vice versa? Maybe we can do that later as a follow-on issue. Otherwise, I will approve.

wangweij · 2020-10-09T00:04:17Z

I tried but cannot find a way to tell if a system is Windows Server 2016 or 2019. Their os.version is all 10.0. I've filed an enhancement at https://bugs.openjdk.java.net/browse/JDK-8254241 for it. That said, I did try running the test on a Windows Server 2019 using new algorithms and it succeeds.

wangweij · 2020-10-09T00:07:39Z

There are existing tests reading openssl generated pkcs12 files in https://github.com/openjdk/jdk/tree/master/test/jdk/sun/security/pkcs12/params, it already contains files using both weak and strong algorithms.

wangweij · 2020-10-09T01:28:19Z

Update params/README, exclude it from the de-BASE64 list (don't know it succeeded) in the ParamsTest.java test. Also remove a useless call in the test.

Thinking about adding a benchmark, but it will be in another commit.

wangweij · 2020-10-09T01:31:02Z

/csr needed

openjdk · 2020-10-09T01:34:06Z

@wangweij this pull request will not be integrated until the CSR request JDK-8228481 for issue JDK-8153005 has been approved.

openjdk · 2020-10-30T12:34:45Z

@wangweij 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:

8153005: Upgrade the default PKCS12 encryption/MAC algorithms

Reviewed-by: mullan

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

8a065ef: 8255005: Fix indentation levels in classFileParser.cpp
e48016b: 8255565: [Vector API] Add missing format strings for extract instructs in x86.ad
2c7fc85: 8254972: Fix pretouch chunk calculations
d128191: 8253473: Javadoc clean up in HttpHandler, HttpPrincipal, HttpContext, and HttpsConfigurator
379ba80: 8255595: delay_to_keep_mmu passes wrong arguments to Monitor wait
1a89d68: 8255285: Move JVMFlag origins into a new enum JVMFlagOrigin
56eb5f5: 8255466: C2 crashes at ciObject::get_oop() const+0x0
5782a2a: 8254975: lambda proxy fails to access a protected member inherited from a split package
d5138d1: 8255604: java/nio/channels/DatagramChannel/Connect.java fails with java.net.BindException: Cannot assign requested address: connect
2a2fa13: 8255449: Improve the exception message of MethodHandles::permuteArguments
... and 71 more: https://git.openjdk.java.net/jdk/compare/e8b75b13dc3efdfc5da602db400d98871f90d074...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

wangweij · 2020-10-30T13:21:47Z

/integrate

openjdk · 2020-10-30T13:24:53Z

@wangweij Since your change was applied there have been 81 commits pushed to the master branch:

8a065ef: 8255005: Fix indentation levels in classFileParser.cpp
e48016b: 8255565: [Vector API] Add missing format strings for extract instructs in x86.ad
2c7fc85: 8254972: Fix pretouch chunk calculations
d128191: 8253473: Javadoc clean up in HttpHandler, HttpPrincipal, HttpContext, and HttpsConfigurator
379ba80: 8255595: delay_to_keep_mmu passes wrong arguments to Monitor wait
1a89d68: 8255285: Move JVMFlag origins into a new enum JVMFlagOrigin
56eb5f5: 8255466: C2 crashes at ciObject::get_oop() const+0x0
5782a2a: 8254975: lambda proxy fails to access a protected member inherited from a split package
d5138d1: 8255604: java/nio/channels/DatagramChannel/Connect.java fails with java.net.BindException: Cannot assign requested address: connect
2a2fa13: 8255449: Improve the exception message of MethodHandles::permuteArguments
... and 71 more: https://git.openjdk.java.net/jdk/compare/e8b75b13dc3efdfc5da602db400d98871f90d074...master

Your commit was automatically rebased without conflicts.

Pushed as commit f77a658.

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

Reviewed-by: mullan

8153005: Upgrade the default PKCS12 encryption/MAC algorithms

b99611b

openjdk bot added the rfr label Oct 1, 2020

openjdk bot added the security label Oct 1, 2020

seanjmullan reviewed Oct 2, 2020

View changes

haimaychao reviewed Oct 7, 2020

View changes

change ic to 10000

6b5c5b5

update README and exclude README

41be78a

openjdk bot added the csr label Oct 9, 2020

openjdk bot removed the csr label Oct 14, 2020

seanjmullan approved these changes Oct 30, 2020

View changes

openjdk bot added the ready label Oct 30, 2020

wangweij added 2 commits Oct 30, 2020

merge

bf02abf

simplify test

31a22fd

openjdk bot closed this Oct 30, 2020

openjdk bot added integrated and removed ready rfr labels Oct 30, 2020

openjdk-notifier bot referenced this issue Oct 30, 2020

8153005: Upgrade the default PKCS12 encryption/MAC algorithms

f77a658

Reviewed-by: mullan

wangweij deleted the 8153005 branch Oct 30, 2020

openjdk / jdk Public

8153005: Upgrade the default PKCS12 encryption/MAC algorithms #473

8153005: Upgrade the default PKCS12 encryption/MAC algorithms #473

wangweij commented Oct 1, 2020 •

edited by openjdk bot

bridgekeeper bot commented Oct 1, 2020

openjdk bot commented Oct 1, 2020

wangweij commented Oct 1, 2020

mlbridge bot commented Oct 1, 2020 •

edited

seanjmullan Oct 2, 2020

wangweij Oct 2, 2020

seanjmullan Oct 6, 2020

wangweij Oct 6, 2020

seanjmullan Oct 2, 2020

wangweij Oct 2, 2020

haimaychao left a comment

haimaychao Oct 7, 2020

haimaychao Oct 7, 2020

wangweij Oct 7, 2020

haimaychao commented Oct 7, 2020

wangweij commented Oct 7, 2020

wangweij commented Oct 8, 2020

seanjmullan commented Oct 8, 2020

wangweij commented Oct 9, 2020 •

edited

wangweij commented Oct 9, 2020 •

edited

wangweij commented Oct 9, 2020

wangweij commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

openjdk bot commented Oct 30, 2020 •

edited

wangweij commented Oct 30, 2020

openjdk bot commented Oct 30, 2020

openjdk / jdk Public

8153005: Upgrade the default PKCS12 encryption/MAC algorithms #473

8153005: Upgrade the default PKCS12 encryption/MAC algorithms #473

Conversation

wangweij commented Oct 1, 2020 • edited by openjdk bot

Progress

Testing

Issue

Reviewers

Download

bridgekeeper bot commented Oct 1, 2020

openjdk bot commented Oct 1, 2020

wangweij commented Oct 1, 2020

mlbridge bot commented Oct 1, 2020 • edited

Webrevs

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

haimaychao left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

haimaychao commented Oct 7, 2020

wangweij commented Oct 7, 2020

wangweij commented Oct 8, 2020

seanjmullan commented Oct 8, 2020

wangweij commented Oct 9, 2020 • edited

wangweij commented Oct 9, 2020 • edited

wangweij commented Oct 9, 2020

wangweij commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

openjdk bot commented Oct 30, 2020 • edited

wangweij commented Oct 30, 2020

openjdk bot commented Oct 30, 2020

wangweij commented Oct 1, 2020 •

edited by openjdk bot

mlbridge bot commented Oct 1, 2020 •

edited

wangweij commented Oct 9, 2020 •

edited

wangweij commented Oct 9, 2020 •

edited

openjdk bot commented Oct 30, 2020 •

edited