3d0f1cb9fd
Based on discussion in PR #3566. Reduce duplicated code in original asn1_utctime_to_tm and asn1_generalizedtime_to_tm, and introduce a new internal function asn1_time_to_tm. This function also checks if the days in the input time string is valid or not for the corresponding month. Test cases are also added. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/3905)
170 lines
4 KiB
C
170 lines
4 KiB
C
/*
|
|
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <time.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/asn1.h>
|
|
#include "asn1_locl.h"
|
|
|
|
int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d)
|
|
{
|
|
/* wrapper around ans1_time_to_tm */
|
|
if (d->type != V_ASN1_UTCTIME)
|
|
return 0;
|
|
return asn1_time_to_tm(tm, d);
|
|
}
|
|
|
|
int ASN1_UTCTIME_check(const ASN1_UTCTIME *d)
|
|
{
|
|
return asn1_utctime_to_tm(NULL, d);
|
|
}
|
|
|
|
int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str)
|
|
{
|
|
ASN1_UTCTIME t;
|
|
|
|
t.type = V_ASN1_UTCTIME;
|
|
t.length = strlen(str);
|
|
t.data = (unsigned char *)str;
|
|
t.flags = 0;
|
|
|
|
if (ASN1_UTCTIME_check(&t)) {
|
|
if (s != NULL) {
|
|
if (!ASN1_STRING_set((ASN1_STRING *)s, str, t.length))
|
|
return 0;
|
|
s->type = V_ASN1_UTCTIME;
|
|
}
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
|
|
{
|
|
return ASN1_UTCTIME_adj(s, t, 0, 0);
|
|
}
|
|
|
|
ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
|
|
int offset_day, long offset_sec)
|
|
{
|
|
char *p;
|
|
struct tm *ts;
|
|
struct tm data;
|
|
const size_t len = 20;
|
|
int free_s = 0;
|
|
|
|
if (s == NULL) {
|
|
s = ASN1_UTCTIME_new();
|
|
if (s == NULL)
|
|
goto err;
|
|
free_s = 1;
|
|
}
|
|
|
|
ts = OPENSSL_gmtime(&t, &data);
|
|
if (ts == NULL)
|
|
goto err;
|
|
|
|
if (offset_day || offset_sec) {
|
|
if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec))
|
|
goto err;
|
|
}
|
|
|
|
if ((ts->tm_year < 50) || (ts->tm_year >= 150))
|
|
goto err;
|
|
|
|
p = (char *)s->data;
|
|
if ((p == NULL) || ((size_t)s->length < len)) {
|
|
p = OPENSSL_malloc(len);
|
|
if (p == NULL) {
|
|
ASN1err(ASN1_F_ASN1_UTCTIME_ADJ, ERR_R_MALLOC_FAILURE);
|
|
goto err;
|
|
}
|
|
OPENSSL_free(s->data);
|
|
s->data = (unsigned char *)p;
|
|
}
|
|
|
|
s->length = BIO_snprintf(p, len, "%02d%02d%02d%02d%02d%02dZ",
|
|
ts->tm_year % 100, ts->tm_mon + 1, ts->tm_mday,
|
|
ts->tm_hour, ts->tm_min, ts->tm_sec);
|
|
s->type = V_ASN1_UTCTIME;
|
|
#ifdef CHARSET_EBCDIC_not
|
|
ebcdic2ascii(s->data, s->data, s->length);
|
|
#endif
|
|
return s;
|
|
err:
|
|
if (free_s)
|
|
ASN1_UTCTIME_free(s);
|
|
return NULL;
|
|
}
|
|
|
|
int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
|
|
{
|
|
struct tm stm, ttm;
|
|
int day, sec;
|
|
|
|
if (!asn1_utctime_to_tm(&stm, s))
|
|
return -2;
|
|
|
|
if (!OPENSSL_gmtime(&t, &ttm))
|
|
return -2;
|
|
|
|
if (!OPENSSL_gmtime_diff(&day, &sec, &ttm, &stm))
|
|
return -2;
|
|
|
|
if (day > 0)
|
|
return 1;
|
|
if (day < 0)
|
|
return -1;
|
|
if (sec > 0)
|
|
return 1;
|
|
if (sec < 0)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
int ASN1_UTCTIME_print(BIO *bp, const ASN1_UTCTIME *tm)
|
|
{
|
|
const char *v;
|
|
int gmt = 0;
|
|
int i;
|
|
int y = 0, M = 0, d = 0, h = 0, m = 0, s = 0;
|
|
|
|
i = tm->length;
|
|
v = (const char *)tm->data;
|
|
|
|
if (i < 10)
|
|
goto err;
|
|
if (v[i - 1] == 'Z')
|
|
gmt = 1;
|
|
for (i = 0; i < 10; i++)
|
|
if ((v[i] > '9') || (v[i] < '0'))
|
|
goto err;
|
|
y = (v[0] - '0') * 10 + (v[1] - '0');
|
|
if (y < 50)
|
|
y += 100;
|
|
M = (v[2] - '0') * 10 + (v[3] - '0');
|
|
if ((M > 12) || (M < 1))
|
|
goto err;
|
|
d = (v[4] - '0') * 10 + (v[5] - '0');
|
|
h = (v[6] - '0') * 10 + (v[7] - '0');
|
|
m = (v[8] - '0') * 10 + (v[9] - '0');
|
|
if (tm->length >= 12 &&
|
|
(v[10] >= '0') && (v[10] <= '9') && (v[11] >= '0') && (v[11] <= '9'))
|
|
s = (v[10] - '0') * 10 + (v[11] - '0');
|
|
|
|
if (BIO_printf(bp, "%s %2d %02d:%02d:%02d %d%s",
|
|
_asn1_mon[M - 1], d, h, m, s, y + 1900,
|
|
(gmt) ? " GMT" : "") <= 0)
|
|
return 0;
|
|
return 1;
|
|
err:
|
|
BIO_write(bp, "Bad time value", 14);
|
|
return 0;
|
|
}
|