Tidy up ASN1_GENERALIZEDTIME_adj and ASN1_UTCTIME_adj.
ASN1_STRING_set saves having to manually manage the ASN1_STRING's
buffer. Also size that buffer correctly and align the free_s vs tmps
mismatch.
We can also assume OPENSSL_gmtime writes to the passed-in struct tm.
Every other caller already assumes this, and both POSIX (gmtime_r) and C
(gmtime_s) agree this is valid.
Finally, the cleanup logic is much simpler if we do all the time stuff
before handling the maybe-object-reuse bits.
Change-Id: I25befc8fa93a1a60246c6abcea6e5d58ee563b48
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/53227
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index e31ac1d..283ff7d 100644
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -107,57 +107,42 @@
ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
time_t t, int offset_day,
long offset_sec) {
- char *p;
- struct tm *ts;
struct tm data;
- size_t len = 20;
- ASN1_GENERALIZEDTIME *tmps = NULL;
-
- if (s == NULL) {
- tmps = ASN1_GENERALIZEDTIME_new();
- } else {
- tmps = s;
- }
- if (tmps == NULL) {
+ if (!OPENSSL_gmtime(&t, &data)) {
return NULL;
}
- 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 (!OPENSSL_gmtime_adj(&data, offset_day, offset_sec)) {
+ return NULL;
}
}
- if (ts->tm_year < 0 - 1900 || ts->tm_year > 9999 - 1900) {
+ if (data.tm_year < 0 - 1900 || data.tm_year > 9999 - 1900) {
OPENSSL_PUT_ERROR(ASN1, ASN1_R_ILLEGAL_TIME_VALUE);
- goto err;
+ return NULL;
}
- p = (char *)tmps->data;
- if ((p == NULL) || ((size_t)tmps->length < len)) {
- p = OPENSSL_malloc(len);
- if (p == NULL) {
- OPENSSL_PUT_ERROR(ASN1, ERR_R_MALLOC_FAILURE);
- goto err;
- }
- OPENSSL_free(tmps->data);
- tmps->data = (unsigned char *)p;
- }
+ char buf[16];
+ BIO_snprintf(buf, sizeof(buf), "%04d%02d%02d%02d%02d%02dZ",
+ data.tm_year + 1900, data.tm_mon + 1, data.tm_mday, data.tm_hour,
+ data.tm_min, data.tm_sec);
- BIO_snprintf(p, len, "%04d%02d%02d%02d%02d%02dZ", ts->tm_year + 1900,
- ts->tm_mon + 1, ts->tm_mday, ts->tm_hour, ts->tm_min,
- ts->tm_sec);
- tmps->length = strlen(p);
- tmps->type = V_ASN1_GENERALIZEDTIME;
- return tmps;
-err:
+ int free_s = 0;
if (s == NULL) {
- ASN1_GENERALIZEDTIME_free(tmps);
+ free_s = 1;
+ s = ASN1_UTCTIME_new();
+ if (s == NULL) {
+ return NULL;
+ }
}
- return NULL;
+
+ if (!ASN1_STRING_set(s, buf, strlen(buf))) {
+ if (free_s) {
+ ASN1_UTCTIME_free(s);
+ }
+ return NULL;
+ }
+ s->type = V_ASN1_GENERALIZEDTIME;
+ return s;
}
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index ac548dd..ac6b598 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -105,59 +105,43 @@
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;
- size_t len = 20;
- int free_s = 0;
-
- if (s == NULL) {
- free_s = 1;
- s = ASN1_UTCTIME_new();
- }
- if (s == NULL) {
- goto err;
- }
-
- ts = OPENSSL_gmtime(&t, &data);
- if (ts == NULL) {
- goto err;
+ if (!OPENSSL_gmtime(&t, &data)) {
+ return NULL;
}
if (offset_day || offset_sec) {
- if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec)) {
- goto err;
+ if (!OPENSSL_gmtime_adj(&data, offset_day, offset_sec)) {
+ return NULL;
}
}
- if ((ts->tm_year < 50) || (ts->tm_year >= 150)) {
- goto err;
+ if (data.tm_year < 50 || data.tm_year >= 150) {
+ return NULL;
}
- p = (char *)s->data;
- if ((p == NULL) || ((size_t)s->length < len)) {
- p = OPENSSL_malloc(len);
- if (p == NULL) {
- OPENSSL_PUT_ERROR(ASN1, ERR_R_MALLOC_FAILURE);
- goto err;
+ char buf[14];
+ BIO_snprintf(buf, sizeof(buf), "%02d%02d%02d%02d%02d%02dZ",
+ data.tm_year % 100, data.tm_mon + 1, data.tm_mday, data.tm_hour,
+ data.tm_min, data.tm_sec);
+
+ int free_s = 0;
+ if (s == NULL) {
+ free_s = 1;
+ s = ASN1_UTCTIME_new();
+ if (s == NULL) {
+ return NULL;
}
- if (s->data != NULL) {
- OPENSSL_free(s->data);
- }
- s->data = (unsigned char *)p;
}
- 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->length = strlen(p);
+ if (!ASN1_STRING_set(s, buf, strlen(buf))) {
+ if (free_s) {
+ ASN1_UTCTIME_free(s);
+ }
+ return NULL;
+ }
s->type = V_ASN1_UTCTIME;
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) {
