oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

more limits

Browse Source
This commit is contained in:
Love Hornquist Astrand
2011-05-22 20:57:30 -07:00
parent 9d4addf9c1
commit ade3d65e73
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/asn1/timegm.c
View File

@@ -33,7 +33,7 @@
#include "der_locl.h" #include "der_locl.h"
RCSID("$Id$"); #define ASN1_MAX_YEAR 2000
static int static int
is_leap(unsigned y) is_leap(unsigned y)
@@ -58,6 +58,12 @@ _der_timegm (struct tm *tm)
time_t res = 0; time_t res = 0;
int i; int i;
/*
* See comment in _der_gmtime
*/
if (tm->tm_year > ASN1_MAX_YEAR)
return 0;
if (tm->tm_year < 0) if (tm->tm_year < 0)
return -1; return -1;
if (tm->tm_mon < 0 || tm->tm_mon > 11) if (tm->tm_mon < 0 || tm->tm_mon > 11)
@@ -101,9 +107,10 @@ _der_gmtime(time_t t, struct tm *tm)
/* /*
* Refuse to calculate time ~ 2000 years into the future, this is * Refuse to calculate time ~ 2000 years into the future, this is
* not possible for systems where time_t is a int32_t, however, * not possible for systems where time_t is a int32_t, however,
* when time_t is a int64_t, that can happen. * when time_t is a int64_t, that can happen, and this becomes a
* denial of sevice.
*/ */
if (days > 356000) if (days > (ASN1_MAX_YEAR * 365))
return NULL; return NULL;
tm->tm_year = 70; tm->tm_year = 70;