ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t)
{
+ return ASN1_TIME_adj(s, t, 0, 0);
+ }
+
+ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
+ int offset_day, long offset_sec)
+ {
struct tm *ts;
struct tm data;
ts=OPENSSL_gmtime(&t,&data);
if (ts == NULL)
+ {
+ ASN1err(ASN1_F_ASN1_TIME_ADJ, ASN1_R_ERROR_GETTING_TIME);
return NULL;
+ }
+ if (offset_day || offset_sec)
+ {
+ if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec))
+ return NULL;
+ }
if((ts->tm_year >= 50) && (ts->tm_year < 150))
- return ASN1_UTCTIME_set(s, t);
- return ASN1_GENERALIZEDTIME_set(s,t);
+ return ASN1_UTCTIME_adj(s, t, offset_day, offset_sec);
+ return ASN1_GENERALIZEDTIME_adj(s, t, offset_day, offset_sec);
}
-int ASN1_TIME_check(ASN1_TIME *t)
+int ASN1_TIME_check(const ASN1_TIME *t)
{
if (t->type == V_ASN1_GENERALIZEDTIME)
return ASN1_GENERALIZEDTIME_check(t);
{
ASN1_GENERALIZEDTIME *ret;
char *str;
+ int newlen;
if (!ASN1_TIME_check(t)) return NULL;
/* grow the string */
if (!ASN1_STRING_set(ret, NULL, t->length + 2))
return NULL;
+ /* ASN1_STRING_set() allocated 'len + 1' bytes. */
+ newlen = t->length + 2 + 1;
str = (char *)ret->data;
/* Work out the century and prepend */
- if (t->data[0] >= '5') strcpy(str, "19");
- else strcpy(str, "20");
+ if (t->data[0] >= '5') BUF_strlcpy(str, "19", newlen);
+ else BUF_strlcpy(str, "20", newlen);
- strcat(str, (char *)t->data);
+ BUF_strlcat(str, (char *)t->data, newlen);
return ret;
}
+
+int ASN1_TIME_set_string(ASN1_TIME *s, const char *str)
+ {
+ ASN1_TIME t;
+
+ t.length = strlen(str);
+ t.data = (unsigned char *)str;
+ t.flags = 0;
+
+ t.type = V_ASN1_UTCTIME;
+
+ if (!ASN1_TIME_check(&t))
+ {
+ t.type = V_ASN1_GENERALIZEDTIME;
+ if (!ASN1_TIME_check(&t))
+ return 0;
+ }
+
+ if (s && !ASN1_STRING_copy((ASN1_STRING *)s, (ASN1_STRING *)&t))
+ return 0;
+
+ return 1;
+ }
+
+#if 0
+static int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *s)
+ {
+ const unsigned char *p;
+
+ if (!ASN1_TIME_check(s))
+ return 0;
+
+ memset(tm, 0 ,sizeof tm);
+ p = s->data;
+
+#define g2(p) (((p)[0] - '0') * 10 + ((p)[1] - '0'))
+ if (s->type == V_ASN1_GENERALIZEDTIME)
+ {
+ int yr = g2(p) * 100 + g2(p + 2);
+ if (yr < 1900)
+ return 0;
+ tm->tm_year = yr - 1900;
+ p += 4;
+ }
+ else
+ {
+ tm->tm_year=g2(p);
+ if(tm->tm_year < 50)
+ tm->tm_year+=100;
+ p += 2;
+ }
+ tm->tm_mon=g2(p)-1;
+ tm->tm_mday=g2(p + 2);
+ tm->tm_hour=g2(p + 4);
+ tm->tm_min=g2(p + 6);
+ p += 8;
+ /* Seconds optional in UTCTime */
+ if (s->type == V_ASN1_GENERALIZEDTIME || (*p >= '0' && *p <= '9'))
+ {
+ tm->tm_sec=g2(p);
+ p += 2;
+ }
+ else
+ tm->tm_sec = 0;
+ if (s->type == V_ASN1_GENERALIZEDTIME)
+ {
+ /* Skip any fractional seconds */
+ if (*p == '.')
+ {
+ p++;
+ while (*p >= '0' && *p <= '9')
+ p++;
+ }
+ }
+ /* Timezone */
+ if(*p != 'Z')
+ {
+ int off_sec = g2(p + 1) * 3600 + g2(p + 3) * 60;
+ if(*p == '-')
+ off_sec = -off_sec;
+ OPENSSL_gmtime_adj(tm, 0, off_sec);
+ }
+ return 1;
+ }
+#endif