Skip to content
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.

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

8279254: PKCS9Attribute SigningTime always encoded in UTFTime #14617

Closed
wants to merge 9 commits into from

Conversation

blperez01
Copy link
Contributor

@blperez01 blperez01 commented Jun 22, 2023

Added single-argument putTime method to DerOutputStream that selects the correct encoding based on the Date value. Similarly, a getTime method was added to DerValue to automatically call the correct decoding function based on the date type specified by the tag. Furthermore, the encode method in PKCS9Attribute was changed to utilize the new putTime method.


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

Issue

  • JDK-8279254: PKCS9Attribute SigningTime always encoded in UTFTime (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14617

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 22, 2023

👋 Welcome back blperez01! 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 openjdk bot added the rfr Pull request is ready for review label Jun 22, 2023
@openjdk
Copy link

openjdk bot commented Jun 22, 2023

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

@openjdk openjdk bot added the security security-dev@openjdk.org label Jun 22, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 22, 2023

Webrevs

*/
public DerOutputStream putTime(Date d) {
@SuppressWarnings("deprecation")
Date low = new Date(1950,1,1);
Copy link
Member

@jnimeh jnimeh Jun 22, 2023

Choose a reason for hiding this comment

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

Isn't this form of the Date constructor deprecated? Alternately you could convert 1/1/1950 into epoch time as a long and use new Date(long) which is not deprecated. Same for line 492.

public static void main(String args[]) throws Exception {
//Check that dates after 2050 use GeneralizedTime
DerOutputStream out = new DerOutputStream();
Date generalizedTimeDate = new Date(2055,3,17);
Copy link
Member

Choose a reason for hiding this comment

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

Same comment as above for both this line and line 50.

Copy link
Member

Choose a reason for hiding this comment

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

Don't forget to change these to use the long-based Date constructor, also in milliseconds.

*/
public DerOutputStream putTime(Date d) {
Date low = new Date(-631152000L); // Dates before 1/1/1950
Date high = new Date(2524607999L); // Dates after 12/31/2049
Copy link
Member

Choose a reason for hiding this comment

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

These two values should be in milliseconds.

public static void main(String args[]) throws Exception {
//Check that dates after 2050 use GeneralizedTime
DerOutputStream out = new DerOutputStream();
Date generalizedTimeDate = new Date(2055,3,17);
Copy link
Member

Choose a reason for hiding this comment

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

Don't forget to change these to use the long-based Date constructor, also in milliseconds.

*/
public DerOutputStream putTime(Date d) {
Date low = new Date(-631152000000L); // Dates before 1/1/1950
Date high = new Date(2524607999000L); // Dates after 12/31/2049
Copy link
Member

Choose a reason for hiding this comment

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

Could these be private static final since they are constants? It would avoid the extra constructor calls each time this method is called.

Copy link
Member

@jnimeh jnimeh 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 to me.

@openjdk
Copy link

openjdk bot commented Jun 23, 2023

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

8279254: PKCS9Attribute SigningTime always encoded in UTFTime

Reviewed-by: jnimeh

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

  • 5ca4cdd: 8309740: Expand timeout windows for tests in JDK-8179502
  • e78fd46: 8310735: Build failure after JDK-8310577 with GCC8
  • 4bf7816: 8309670: java -help output for --module-path / -p is incomplete
  • d1d2b55: 8309733: [macOS, Accessibility] VoiceOver: Incorrect announcements of JRadioButton
  • d6685f0: 8310510: Remove WordsPerLong
  • 31dcda5: 8295210: IR framework should not whitelist -XX:-UseTLAB
  • 4772893: 8310581: retry_class_loading_during_parsing() is not used
  • 5a82fa3: 8310577: Fix -Wconversion warnings in interpreter and oops
  • 130a9f1: 8292704: sun/security/tools/jarsigner/compatibility/Compatibility.java use wrong key size for EC
  • 0e4fde3: 8310453: Update javadoc of java.lang.Object
  • ... and 65 more: https://git.openjdk.org/jdk/compare/4eb4f20ae22a8f6a49cbbcaa6603ee19ed078e8b...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 (@jnimeh) 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).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 23, 2023
@blperez01
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 23, 2023
@openjdk
Copy link

openjdk bot commented Jun 23, 2023

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

@jnimeh
Copy link
Member

jnimeh commented Jun 23, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 23, 2023

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

  • 5ca4cdd: 8309740: Expand timeout windows for tests in JDK-8179502
  • e78fd46: 8310735: Build failure after JDK-8310577 with GCC8
  • 4bf7816: 8309670: java -help output for --module-path / -p is incomplete
  • d1d2b55: 8309733: [macOS, Accessibility] VoiceOver: Incorrect announcements of JRadioButton
  • d6685f0: 8310510: Remove WordsPerLong
  • 31dcda5: 8295210: IR framework should not whitelist -XX:-UseTLAB
  • 4772893: 8310581: retry_class_loading_during_parsing() is not used
  • 5a82fa3: 8310577: Fix -Wconversion warnings in interpreter and oops
  • 130a9f1: 8292704: sun/security/tools/jarsigner/compatibility/Compatibility.java use wrong key size for EC
  • 0e4fde3: 8310453: Update javadoc of java.lang.Object
  • ... and 65 more: https://git.openjdk.org/jdk/compare/4eb4f20ae22a8f6a49cbbcaa6603ee19ed078e8b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 23, 2023
@openjdk openjdk bot closed this Jun 23, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 23, 2023
@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Jun 23, 2023
@openjdk
Copy link

openjdk bot commented Jun 23, 2023

@jnimeh @blperez01 Pushed as commit 7628da2.

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

@blperez01 blperez01 deleted the JDK-8279254 branch June 23, 2023 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

2 participants