archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8279254: PKCS9Attribute SigningTime always encoded in UTFTime

Browse source 
Reviewed-by: jnimeh
This commit is contained in:
Ben Perez 2023-06-23 15:31:16 +00:00 • committed by Jamil Nimeh
parent 5ca4cdd2ca
commit 7628da2008
5 changed files with 93 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -463,8 +463,7 @@ public class PKCS9Attribute implements DerEncoder {
case 5: // signing time
byte elemTag = elems[0].getTag();
DerInputStream dis = new DerInputStream(elems[0].toByteArray());
value = (elemTag == DerValue.tag_GeneralizedTime) ?
dis.getGeneralizedTime() : dis.getUTCTime();
value = dis.getTime();
break;
case 6: // countersignature
@ -570,7 +569,7 @@ public class PKCS9Attribute implements DerEncoder {
case 5: // signing time
{
DerOutputStream temp2 = new DerOutputStream();
temp2.putUTCTime((Date) value);
temp2.putTime((Date) value);
temp.write(DerValue.tag_Set, temp2.toByteArray());
}
break;

6
src/java.base/share/classes/sun/security/util/DerInputStream.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -189,6 +189,10 @@ public class DerInputStream {
return getDerValue().getGeneralString();
}
public Date getTime() throws IOException {
return getDerValue().getTime();
}
public Date getUTCTime() throws IOException {
return getDerValue().getUTCTime();
}

19
src/java.base/share/classes/sun/security/util/DerOutputStream.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -482,6 +482,23 @@ public final class DerOutputStream
return this;
}
/**
* 1/1/1950 is the lowest date that RFC 2630 serializes to UTC time
*/
private static final Date utcLow = new Date(-631152000000L); // Dates before 1/1/1950
/**
* 12/31/2049 is the highest date that RFC 2630 serializes to UTC time
*/
private static final Date utcHigh = new Date(2524607999000L);
/**
* Takes a Date and chooses UTC or GeneralizedTime as per RFC 2630
*/
public DerOutputStream putTime(Date d) {
return (d.before(utcLow) || d.after(utcHigh)) ? putGeneralizedTime(d) : putUTCTime(d);
}
/**
* Marshals a DER UTC time/date value.
*

10
src/java.base/share/classes/sun/security/util/DerValue.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -1060,6 +1060,14 @@ public class DerValue {
return b - '0';
}
/**
* Determines whether Date was encoded as UTC or Generalized time and
* calls getUTCTime or getGeneralizedTime accordingly
*/
public Date getTime() throws IOException {
return (tag == tag_UtcTime) ? getUTCTime() : getGeneralizedTime();
}
/**
* Returns a Date if the DerValue is UtcTime.
*