Skip to content

Commit

Permalink
X.509: Handle midnight alternative notation in GeneralizedTime
Browse files Browse the repository at this point in the history
The ASN.1 GeneralizedTime object carries an ISO 8601 format date and time.
The time is permitted to show midnight as 00:00 or 24:00 (the latter being
equivalent of 00:00 of the following day).

The permitted value is checked in x509_decode_time() but the actual
handling is left to mktime64().

Without this patch, certain X.509 certificates will be rejected and could
lead to an unbootable kernel.

Note that with this patch we also permit any 24:mm:ss time and extend this
to UTCTime, which whilst not strictly correct don't permit much leeway in
fiddling date strings.

Reported-by: Rudolf Polzer <[email protected]>
Signed-off-by: David Howells <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
cc: David Woodhouse <[email protected]>
cc: John Stultz <[email protected]>
  • Loading branch information
dhowells committed Feb 29, 2016
1 parent da02559 commit 7650cb8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crypto/asymmetric_keys/x509_cert_parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ int x509_decode_time(time64_t *_t, size_t hdrlen,
}

if (day < 1 || day > mon_len ||
hour > 23 ||
hour > 24 || /* ISO 8601 permits 24:00:00 as midnight tomorrow */
min > 59 ||
sec > 60) /* ISO 8601 permits leap seconds [X.680 46.3] */
goto invalid_time;
Expand Down

0 comments on commit 7650cb8

Please sign in to comment.