diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-07-08 00:36:47 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-07-08 00:36:47 +0000 |
| commit | b81e24cda687e9633c18b741ed92ce6bafb77643 (patch) | |
| tree | dd3c46027b00983b6a3c6d3c27721e4fd7acf4f2 /src | |
| parent | 19d579e8cbb7bd95ed4fd50697c689ab7b725963 (diff) | |
| parent | 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868 (diff) | |
| download | tor-b81e24cda687e9633c18b741ed92ce6bafb77643.tar.gz tor-b81e24cda687e9633c18b741ed92ce6bafb77643.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/tls/x509.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c index 67a8b49b9d..b4a0f8dabf 100644 --- a/src/lib/tls/x509.c +++ b/src/lib/tls/x509.c @@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now, time_t *start_time_out, time_t *end_time_out) { + tor_assert(cert_lifetime < INT_MAX); time_t start_time, end_time; /* Make sure we're part-way through the certificate lifetime, rather * than having it start right now. Don't choose quite uniformly, since @@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now, const time_t start_granularity = 24*3600; time_t earliest_start_time; /* Don't actually start in the future! */ - if (cert_lifetime <= min_real_lifetime + start_granularity) { + if ((int)cert_lifetime <= min_real_lifetime + start_granularity) { earliest_start_time = now - 1; } else { earliest_start_time = now + min_real_lifetime + start_granularity |