sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-11-27 00:00:29 -05:00
Code Issues Projects Releases Wiki Activity

fixed timezone compensation when parsing ASN.1 dates

Browse Source
This commit is contained in:
Tobias Brunner 2009-05-08 15:21:31 +02:00
parent 9d737ecfc5
commit 65ea37abcd
2 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure.in
View File

@ -774,10 +774,6 @@ AC_SEARCH_LIBS(dlopen, dl, [DLLIB=$LIBS])
LIBS=$saved_LIBS LIBS=$saved_LIBS
AC_SUBST(DLLIB) AC_SUBST(DLLIB)
AC_CHECK_FUNCS(backtrace)
AC_CHECK_FUNCS(prctl)
AC_CHECK_FUNCS(gethostbyname_r)
AC_MSG_CHECKING(for dladdr) AC_MSG_CHECKING(for dladdr)
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#define _GNU_SOURCE [#define _GNU_SOURCE
@ -788,6 +784,26 @@ AC_TRY_COMPILE(
[AC_MSG_RESULT([no])] [AC_MSG_RESULT([no])]
) )
AC_CHECK_FUNCS(backtrace)
AC_CHECK_FUNCS(prctl)
AC_CHECK_FUNCS(gethostbyname_r)
AC_CHECK_FUNCS(timegm)
AC_MSG_CHECKING(for timezone variable)
AC_TRY_LINK(
[#include <time.h>],
[/* check for timezone function (e.g. FreeBSD) */
return (int)timezone(0, 0);],
[AC_MSG_RESULT([no])],
[AC_TRY_LINK(
[#include <time.h>],
[/* check for global variable */
return (int)timezone;],
[AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_VAR_TIMEZONE])],
[AC_MSG_RESULT([no])]
)]
)
AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h) AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h)
AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [],

35
src/libstrongswan/asn1/asn1.c
View File

@ -18,6 +18,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <pthread.h>
#include <utils.h> #include <utils.h>
#include <debug.h> #include <debug.h>
@ -300,13 +301,26 @@ u_int asn1_length(chunk_t *blob)
#define TIME_MAX 0x7fffffff #define TIME_MAX 0x7fffffff
#if !defined(HAVE_TIMEGM) && !defined(HAVE_VAR_TIMEZONE)
pthread_once_t utc_offset_once = PTHREAD_ONCE_INIT;
static time_t utc_offset;
static void init_utc_offset()
{
time_t now;
struct tm utc;
now = time(NULL);
gmtime_r(&now, &utc);
utc_offset = mktime(&utc) - now;
}
#endif
/** /**
* 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, local; struct tm t;
time_t tc, tz_offset, now; 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)
@ -372,17 +386,26 @@ time_t asn1_to_time(const chunk_t *utctime, asn1_t type)
t.tm_isdst = 0; t.tm_isdst = 0;
/* convert to time_t */ /* convert to time_t */
#ifdef HAVE_TIMEGM
tc = timegm(&t);
#else
tc = mktime(&t); tc = mktime(&t);
#endif
if (tc == -1) if (tc == -1)
{ {
return TIME_MAX; return TIME_MAX;
} }
/* if no conversion overflow occurred, compensate timezone */ /* if no conversion overflow occurred, compensate timezone */
now = time(NULL); #ifndef HAVE_TIMEGM
localtime_r(&now, &local); #ifdef HAVE_VAR_TIMEZONE
return tc - local.tm_gmtoff - tz_offset; tz_offset += timezone;
#else
pthread_once(&utc_offset_once, init_utc_offset);
tz_offset += utc_offset;
#endif
#endif
return tc - tz_offset;
} }
/** /**