Skip to content

8343232: PKCS#12 KeyStore support for RFC 9879: Use of Password-Based Message Authentication Code 1 (PBMAC1) #24429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 37 commits into from
Closed

8343232: PKCS#12 KeyStore support for RFC 9879: Use of Password-Based Message Authentication Code 1 (PBMAC1) #24429

wants to merge 37 commits into from

Conversation

@mcpowers
Copy link
Contributor

@mcpowers mcpowers commented Apr 3, 2025 •
edited by openjdk bot
Loading

JDK-8343232

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change requires CSR request JDK-8370042 to be approved

Issues

  • JDK-8343232: PKCS#12 KeyStore support for RFC 9879: Use of Password-Based Message Authentication Code 1 (PBMAC1) (Enhancement - P2)
  • JDK-8370042: PKCS#12 KeyStore support for RFC 9879: Use of Password-Based Message Authentication Code 1 (PBMAC1) (CSR)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24429/head:pull/24429
$ git checkout pull/24429

Update a local copy of the PR:
$ git checkout pull/24429
$ git pull https://git.openjdk.org/jdk.git pull/24429/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24429

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24429.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 3, 2025

👋 Welcome back mpowers! 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
Copy link

openjdk bot commented Apr 3, 2025 •
edited
Loading

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

8343232: PKCS#12 KeyStore support for RFC 9879: Use of Password-Based Message Authentication Code 1 (PBMAC1)

Reviewed-by: weijun, 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 27 new commits pushed to the master branch:

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.

@openjdk
Copy link

openjdk bot commented Apr 3, 2025 •
edited
Loading

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 30, 2025

@mcpowers This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@mcpowers
Copy link
Contributor Author

mcpowers commented May 30, 2025

/keepalive

@openjdk
Copy link

openjdk bot commented May 30, 2025

@mcpowers The pull request is being re-evaluated and the inactivity timeout has been reset.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 22, 2025
wangweij
wangweij reviewed Oct 23, 2025
View reviewed changes
Copy link
Contributor

@wangweij wangweij left a comment

Choose a reason for hiding this comment

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

Some comments.

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Oct 23, 2025
wangweij
wangweij approved these changes Oct 28, 2025
View reviewed changes
Copy link
Contributor

@wangweij wangweij left a comment

Choose a reason for hiding this comment

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

Everything looks fine.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 28, 2025
seanjmullan
seanjmullan reviewed Oct 28, 2025
View reviewed changes
src/java.base/share/classes/sun/security/util/PBKDF2Parameters.java Outdated

DerOutputStream out = new DerOutputStream();
DerOutputStream tmp0 = new DerOutputStream();
DerOutputStream tmp1 = new DerOutputStream();
Copy link
Member

@seanjmullan seanjmullan Oct 28, 2025

Choose a reason for hiding this comment

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

unused variable.

Copy link
Contributor Author

@mcpowers mcpowers Oct 29, 2025

Choose a reason for hiding this comment

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

fixed

src/java.base/share/classes/sun/security/util/PBKDF2Parameters.java
/*
* Encode PBKDF2 parameters from components.
*/
public static byte[] encode(byte[] salt, int iterationCount,
Copy link
Member

@seanjmullan seanjmullan Oct 28, 2025

Choose a reason for hiding this comment

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

This method actually encodes more than the parameters. It also encodes the outer algorithm id. I guess that's ok, but I suggest adding a comment that says that.

Copy link
Contributor Author

@mcpowers mcpowers Oct 29, 2025

Choose a reason for hiding this comment

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

added

seanjmullan
seanjmullan reviewed Oct 28, 2025
View reviewed changes
src/java.base/share/classes/sun/security/pkcs12/PBMAC1Parameters.java
/*
* Encode PBMAC1 parameters from components.
*/
static byte[] encode(byte[] salt, int iterationCount, int keyLength,
Copy link
Member

@seanjmullan seanjmullan Oct 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This is encoding more than the PBMAC1 parameters, it is also encoding the MacData structure. That should really be in the MacData class.

Copy link
Contributor Author

@mcpowers mcpowers Oct 29, 2025

Choose a reason for hiding this comment

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

I moved it to the MacData class as you suggest. macSalt ("NOT USED") and iterations (1) also belong in MacData and have been moved.

Copy link
Contributor

@wangweij wangweij Oct 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

The latest encode returns two algorithm identifiers concatenated together without any frame. I suggest we follow the PBKDF2Parameters.java style you described below ("The outer algorithm ID is also encoded in addition to the parameters"), which means moving the code around tmp2 and tmp3 from MacData::encode here simply call tmp1.writeBytes(PBMAC1Parameters.encode(...)) in MacData::encode.

Or, if you prefer to encode the PBMAC1 OID outside (which follows most AlgorithmParametersSpi classes), put the concatenation inside a SEQUENCE and return it. This is similar to #24429 (comment).

Copy link
Contributor Author

@mcpowers mcpowers Oct 30, 2025

Choose a reason for hiding this comment

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

I choose the latter.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Oct 29, 2025
seanjmullan
seanjmullan approved these changes Oct 29, 2025
View reviewed changes
Copy link
Member

@seanjmullan seanjmullan left a comment

Choose a reason for hiding this comment

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

Looks good!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 29, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Oct 30, 2025
wangweij
wangweij reviewed Oct 31, 2025
View reviewed changes
src/java.base/share/classes/sun/security/pkcs12/MacData.java Outdated
// id-PBMAC1 OBJECT IDENTIFIER ::= { pkcs-5 14 }
tmp2.putOID(ObjectIdentifier.of(KnownOIDs.PBMAC1));
tmp2.write(DerValue.tag_Sequence, tmp3);
tmp2.write(tmp3);
Copy link
Contributor

@wangweij wangweij Oct 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Since there is only one raw byte array in tmp3, the following lines

DerOutputStream tmp3 = new DerOutputStream();
tmp3.writeBytes(PBMAC1Parameters.encode(macSalt, iterations, keyLength, kdfHmac, hmac));
tmp2.write(tmp3);

is equivalent to

tmp2.writeBytes(PBMAC1Parameters.encode(macSalt, iterations, keyLength, kdfHmac, hmac));

Copy link
Contributor Author

@mcpowers mcpowers Oct 31, 2025

Choose a reason for hiding this comment

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

fixed

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 31, 2025
@mcpowers
Copy link
Contributor Author

mcpowers commented Oct 31, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Oct 31, 2025

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 31, 2025
@openjdk openjdk bot closed this Oct 31, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 31, 2025
@openjdk
Copy link

openjdk bot commented Oct 31, 2025

@mcpowers Pushed as commit 1781b18.

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

@mcpowers mcpowers deleted the JDK-8343232 branch November 3, 2025 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

6 more reviewers

@ecki ecki ecki left review comments

@fitzsim fitzsim fitzsim left review comments

@valeriepeng valeriepeng valeriepeng left review comments

@mpdonova mpdonova mpdonova left review comments

@wangweij wangweij wangweij approved these changes

@seanjmullan seanjmullan seanjmullan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

integrated Pull request has been integrated security [email protected]

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@mcpowers @wangweij @fitzsim @mpdonova @seanjmullan @ecki @valeriepeng