Index: nss/lib/util/dertime.c |
=================================================================== |
--- nss/lib/util/dertime.c (revision 203524) |
+++ nss/lib/util/dertime.c (working copy) |
@@ -26,7 +26,7 @@ |
/* gmttime must contains UTC time in micro-seconds unit */ |
SECStatus |
-DER_TimeToUTCTimeArena(PRArenaPool* arenaOpt, SECItem *dst, int64 gmttime) |
+DER_TimeToUTCTimeArena(PLArenaPool* arenaOpt, SECItem *dst, PRTime gmttime) |
{ |
PRExplodedTime printableTime; |
unsigned char *d; |
@@ -47,7 +47,7 @@ |
return SECFailure; |
} |
- /* Convert an int64 time to a printable format. */ |
+ /* Convert a PRTime to a printable format. */ |
PR_ExplodeTime(gmttime, PR_GMTParameters, &printableTime); |
/* The month in UTC time is base one */ |
@@ -74,7 +74,7 @@ |
} |
SECStatus |
-DER_TimeToUTCTime(SECItem *dst, int64 gmttime) |
+DER_TimeToUTCTime(SECItem *dst, PRTime gmttime) |
{ |
return DER_TimeToUTCTimeArena(NULL, dst, gmttime); |
} |
@@ -95,13 +95,13 @@ |
** It suffices to ensure that the input "string" is at least 17 bytes long. |
*/ |
SECStatus |
-DER_AsciiToTime(int64 *dst, const char *string) |
+DER_AsciiToTime(PRTime *dst, const char *string) |
{ |
return der_TimeStringToTime(dst, string, UTC_STRING, NULL); |
} |
SECStatus |
-DER_UTCTimeToTime(int64 *dst, const SECItem *time) |
+DER_UTCTimeToTime(PRTime *dst, const SECItem *time) |
{ |
/* Minimum valid UTCTime is yymmddhhmmZ which is 11 bytes. |
** Maximum valid UTCTime is yymmddhhmmss+0000 which is 17 bytes. |
@@ -143,7 +143,7 @@ |
certificate extension, which does not have this restriction. |
*/ |
SECStatus |
-DER_TimeToGeneralizedTimeArena(PRArenaPool* arenaOpt, SECItem *dst, int64 gmttime) |
+DER_TimeToGeneralizedTimeArena(PLArenaPool* arenaOpt, SECItem *dst, PRTime gmttime) |
{ |
PRExplodedTime printableTime; |
unsigned char *d; |
@@ -163,7 +163,7 @@ |
return SECFailure; |
} |
- /* Convert an int64 time to a printable format. */ |
+ /* Convert a PRTime to a printable format. */ |
PR_ExplodeTime(gmttime, PR_GMTParameters, &printableTime); |
/* The month in Generalized time is base one */ |
@@ -188,14 +188,14 @@ |
} |
SECStatus |
-DER_TimeToGeneralizedTime(SECItem *dst, int64 gmttime) |
+DER_TimeToGeneralizedTime(SECItem *dst, PRTime gmttime) |
{ |
return DER_TimeToGeneralizedTimeArena(NULL, dst, gmttime); |
} |
SECStatus |
-DER_GeneralizedTimeToTime(int64 *dst, const SECItem *time) |
+DER_GeneralizedTimeToTime(PRTime *dst, const SECItem *time) |
{ |
/* Minimum valid GeneralizedTime is ccyymmddhhmmZ which is 13 bytes. |
** Maximum valid GeneralizedTime is ccyymmddhhmmss+0000 which is 19 bytes. |
@@ -234,7 +234,7 @@ |
{ |
PRExplodedTime genTime; |
long hourOff = 0, minOff = 0; |
- uint16 century; |
+ PRUint16 century; |
char signum; |
if (string == NULL || dst == NULL) { |