diff options
author | Rich Salz <rsalz@openssl.org> | 2017-06-11 16:36:07 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-06-11 16:36:07 -0400 |
commit | 04e62715db684d83bffac53793ff4cfac51e047a (patch) | |
tree | b286fb5cda68811e59d3bc5779cec8b9ff2e14ed /crypto/asn1/a_gentm.c | |
parent | 7aefa75490991d71e190be38457223704fefff34 (diff) |
Introduce ASN1_TIME_set_string_X509 API
Make funcs to deal with non-null-term'd string
in both asn1_generalizedtime_to_tm() and asn1_utctime_to_tm().
Fixes issue #3444.
This one is used to enforce strict format (RFC 5280) check and to
convert GeneralizedTime to UTCTime.
apps/ca has been changed to use the new API.
Test cases and documentation are updated/added
Signed-off-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3566)
Diffstat (limited to 'crypto/asn1/a_gentm.c')
-rw-r--r-- | crypto/asn1/a_gentm.c | 57 |
1 files changed, 47 insertions, 10 deletions
diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c index ff1b695475..bd90d05114 100644 --- a/crypto/asn1/a_gentm.c +++ b/crypto/asn1/a_gentm.c @@ -22,7 +22,7 @@ int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d) static const int min[9] = { 0, 0, 1, 1, 0, 0, 0, 0, 0 }; static const int max[9] = { 99, 99, 12, 31, 23, 59, 59, 12, 59 }; char *a; - int n, i, l, o; + int n, i, l, o, min_l = 13, strict = 0; if (d->type != V_ASN1_GENERALIZEDTIME) return (0); @@ -34,10 +34,26 @@ int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d) * as YYYY. This stuff treats everything as a two digit field so make * first two fields 00 to 99 */ - if (l < 13) + + /* + * 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 + * 4. fractional seconds are not allowed in GeneralizedTime + */ + + if (d->flags & ASN1_STRING_FLAG_X509_TIME) { + min_l = 15; + strict = 1; + } + + if (l < min_l) goto err; for (i = 0; i < 7; i++) { - if ((i == 6) && ((a[o] == 'Z') || (a[o] == '+') || (a[o] == '-'))) { + if (!strict && (i == 6) && ((a[o] == 'Z') || (a[o] == '+') || (a[o] == '-'))) { i++; if (tm) tm->tm_sec = 0; @@ -46,13 +62,15 @@ int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *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])) @@ -88,22 +106,39 @@ int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d) * digits. */ if (a[o] == '.') { - if (++o > l) + if (strict) + /* RFC 5280 forbids fractional seconds */ + goto err; + if (++o == l) goto err; i = o; - while ((a[o] >= '0') && (a[o] <= '9') && (o <= l)) + while ((o < l) && (a[o] >= '0') && (a[o] <= '9')) o++; /* Must have at least one digit after decimal point */ if (i == o) goto err; + /* no more bytes to read, but we haven't seen time-zone yet */ + if (o == l) + goto err; } - 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 not equal, no need to do subsequent checks + * since the following for-loop will add 'o' by 4 + * and the final return statement will check if 'l' + * and 'o' are equal. + */ + if (o + 4 != l) goto err; for (i = 7; i < 9; i++) { if ((a[o] < '0') || (a[o] > '9')) @@ -146,6 +181,8 @@ int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str) t.type = V_ASN1_GENERALIZEDTIME; t.length = strlen(str); t.data = (unsigned char *)str; + t.flags = 0; + if (ASN1_GENERALIZEDTIME_check(&t)) { if (s != NULL) { if (!ASN1_STRING_set((ASN1_STRING *)s, str, t.length)) |