denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed ASN.1 to time_t conversion on 32-bit system for dates after Jan 19 03:14:07 UTC 2038

Browse Source
This commit is contained in:
Andreas Steffen
2009-03-27 08:54:10 +00:00
parent 6527da58ae
commit 5021380d35
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/asn1/asn1.c
+12 -7
View File
@@ -264,13 +264,15 @@ u_int asn1_length(chunk_t *blob)
return len; return len;
} }
#define TIME_MAX 0x7fffffff
/** /**
* Converts ASN.1 UTCTIME or GENERALIZEDTIME into calender time * Converts ASN.1 UTCTIME or GENERALIZEDTIME into calender time
*/ */
time_t asn1_to_time(const chunk_t *utctime, asn1_t type) time_t asn1_to_time(const chunk_t *utctime, asn1_t type)
{ {
struct tm t; struct tm t;
time_t tz_offset; time_t tc, tz_offset;
u_char *eot = NULL; u_char *eot = NULL;
if ((eot = memchr(utctime->ptr, 'Z', utctime->len)) != NULL) if ((eot = memchr(utctime->ptr, 'Z', utctime->len)) != NULL)
@@ -296,12 +298,13 @@ time_t asn1_to_time(const chunk_t *utctime, asn1_t type)
return 0; /* error in time format */ return 0; /* error in time format */
} }
/* parse ASN.1 time string */
{ {
const char* format = (type == ASN1_UTCTIME)? "%2d%2d%2d%2d%2d": const char* format = (type == ASN1_UTCTIME)? "%2d%2d%2d%2d%2d":
"%4d%2d%2d%2d%2d"; "%4d%2d%2d%2d%2d";
sscanf(utctime->ptr, format, &t.tm_year, &t.tm_mon, &t.tm_mday, sscanf(utctime->ptr, format, &t.tm_year, &t.tm_mon, &t.tm_mday,
&t.tm_hour, &t.tm_min); &t.tm_hour, &t.tm_min);
} }
/* is there a seconds field? */ /* is there a seconds field? */
@@ -334,9 +337,11 @@ time_t asn1_to_time(const chunk_t *utctime, asn1_t type)
/* set daylight saving time to off */ /* set daylight saving time to off */
t.tm_isdst = 0; t.tm_isdst = 0;
/* compensate timezone */ /* convert to time_t */
tc = mktime(&t);
return mktime(&t) - timezone - tz_offset; /* if no conversion overflow occurred, compensate timezone */
return (tc == -1) ? TIME_MAX : tc - timezone - tz_offset;
} }
/** /**
src/pluto/asn1.c
+8 -3
View File
@@ -348,6 +348,8 @@ is_printablestring(chunk_t str)
return TRUE; return TRUE;
} }
#define TIME_MAX 0x7fffffff
/* /*
* Converts ASN.1 UTCTIME or GENERALIZEDTIME into calender time * Converts ASN.1 UTCTIME or GENERALIZEDTIME into calender time
*/ */
@@ -355,7 +357,7 @@ time_t
asn1totime(const chunk_t *utctime, asn1_t type) asn1totime(const chunk_t *utctime, asn1_t type)
{ {
struct tm t; struct tm t;
time_t tz_offset; time_t tc, tz_offset;
u_char *eot = NULL; u_char *eot = NULL;
if ((eot = memchr(utctime->ptr, 'Z', utctime->len)) != NULL) if ((eot = memchr(utctime->ptr, 'Z', utctime->len)) != NULL)
@@ -381,6 +383,7 @@ asn1totime(const chunk_t *utctime, asn1_t type)
return 0; /* error in time format */ return 0; /* error in time format */
} }
/* parse ASN.1 time string */
{ {
const char* format = (type == ASN1_UTCTIME)? "%2d%2d%2d%2d%2d": const char* format = (type == ASN1_UTCTIME)? "%2d%2d%2d%2d%2d":
"%4d%2d%2d%2d%2d"; "%4d%2d%2d%2d%2d";
@@ -419,9 +422,11 @@ asn1totime(const chunk_t *utctime, asn1_t type)
/* set daylight saving time to off */ /* set daylight saving time to off */
t.tm_isdst = 0; t.tm_isdst = 0;
/* compensate timezone */ /* convert to time_t */
tc = mktime(&t);
return mktime(&t) - timezone - tz_offset; /* if no conversion overflow occurred, compensate timezone */
return (tc == -1) ? TIME_MAX : tc - timezone - tz_offset;
} }
/* /*