-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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
Conversation
…eneralizedTime depending on tag value. Added test
👋 Welcome back blperez01! A progress list of the required criteria for merging this PR into |
@blperez01 The following label will be automatically applied to this pull request:
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. |
Webrevs
|
*/ | ||
public DerOutputStream putTime(Date d) { | ||
@SuppressWarnings("deprecation") | ||
Date low = new Date(1950,1,1); |
There was a problem hiding this comment.
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); |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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); |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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.
There was a problem hiding this 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.
@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:
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
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 |
@blperez01 |
/sponsor |
Going to push as commit 7628da2.
Your commit was automatically rebased without conflicts. |
@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. |
Added single-argument
putTime
method toDerOutputStream
that selects the correct encoding based on theDate
value. Similarly, agetTime
method was added toDerValue
to automatically call the correct decoding function based on the date type specified by thetag
. Furthermore, theencode
method inPKCS9Attribute
was changed to utilize the newputTime
method.Progress
Issue
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