diff options
Diffstat (limited to 'crypto/asn1/a_utctm.c')
-rw-r--r-- | crypto/asn1/a_utctm.c | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index 9797aa8a1e..ee98e4b489 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -18,7 +18,7 @@ int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d) static const int min[8] = { 0, 1, 1, 0, 0, 0, 0, 0 }; static const int max[8] = { 99, 12, 31, 23, 59, 59, 12, 59 }; char *a; - int n, i, l, o; + int n, i, l, o, min_l = 11, strict = 0; if (d->type != V_ASN1_UTCTIME) return (0); @@ -26,10 +26,24 @@ int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d) a = (char *)d->data; o = 0; - if (l < 11) + /* + * ASN1_STRING_FLAG_X509_TIME is used to enforce RFC 5280 + * time string format, in which: + * + * 1. "seconds" is a 'MUST' + * 2. "Zulu" timezone is a 'MUST' + * 3. "+|-" is not allowed to indicate a time zone + */ + + if (d->flags & ASN1_STRING_FLAG_X509_TIME) { + min_l = 13; + strict = 1; + } + + if (l < min_l) goto err; for (i = 0; i < 6; i++) { - if ((i == 5) && ((a[o] == 'Z') || (a[o] == '+') || (a[o] == '-'))) { + if (!strict && (i == 5) && ((a[o] == 'Z') || (a[o] == '+') || (a[o] == '-'))) { i++; if (tm) tm->tm_sec = 0; @@ -38,13 +52,15 @@ int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d) if ((a[o] < '0') || (a[o] > '9')) goto err; n = a[o] - '0'; - if (++o > l) + /* incomplete 2-digital number */ + if (++o == l) goto err; if ((a[o] < '0') || (a[o] > '9')) goto err; n = (n * 10) + a[o] - '0'; - if (++o > l) + /* no more bytes to read, but we haven't seen time-zone yet */ + if (++o == l) goto err; if ((n < min[i]) || (n > max[i])) @@ -72,12 +88,18 @@ int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d) } } } - if (a[o] == 'Z') + + /* + * 'o' will never point to '\0' at this point, the only chance + * 'o' can point th '\0' is either the subsequent if or the first + * else if is true. + */ + if (a[o] == 'Z') { o++; - else if ((a[o] == '+') || (a[o] == '-')) { + } else if (!strict && ((a[o] == '+') || (a[o] == '-'))) { int offsign = a[o] == '-' ? 1 : -1, offset = 0; o++; - if (o + 4 > l) + if (o + 4 != l) goto err; for (i = 6; i < 8; i++) { if ((a[o] < '0') || (a[o] > '9')) @@ -99,6 +121,9 @@ int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d) } if (offset && !OPENSSL_gmtime_adj(tm, 0, offset * offsign)) return 0; + } else { + /* not Z, or not +/- in non-strict mode */ + return 0; } return o == l; err: @@ -117,6 +142,8 @@ int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str) 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)) |