Commit c364e0e8 authored by Alexander Hansen Færøy's avatar Alexander Hansen Færøy 💬
Browse files

Merge branch 'maint-0.4.2' into maint-0.4.3

parents a213d279 b81e24cd

changes/bug40028

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/lib/tls/x509.c

+2 −1
Original line number Diff line number Diff line
@@ -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