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 | 22a7817995226ff9b466df5f87d6c11ecbf06731 (patch) | |
| tree | 1e60eded765649a3e4b2d15d9d74f3f0e08a82ee | |
| parent | 7759fee482833c44e053252b8df249075791793d (diff) | |
| parent | 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868 (diff) | |
| download | tor-22a7817995226ff9b466df5f87d6c11ecbf06731.tar.gz tor-22a7817995226ff9b466df5f87d6c11ecbf06731.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | changes/bug40028 | 3 | ||||
| -rw-r--r-- | src/lib/tls/x509.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug40028 b/changes/bug40028 new file mode 100644 index 0000000000..cfd1ffe516 --- /dev/null +++ b/changes/bug40028 @@ -0,0 +1,3 @@ + o Minor bugfixes (compiler warnings): + - Fix a compiler warning on platforms with 32-bit time_t values. + Fixes bug 40028; bugfix on 0.3.2.8-rc. 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 |