July 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit 9603d8af0b36dc8faf297c2a300becebfc2f721b Merge: d4c79cae7 c364e0e83 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 8 00:36:48 2020 +0000 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit c364e0e83bd98bf66b68cdacff28ad6c5924abf5 Merge: a213d2793 b81e24cda Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 8 00:36:48 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit b81e24cda687e9633c18b741ed92ce6bafb77643 Merge: 19d579e8c 3e08dd9df Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 8 00:36:47 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit e4bfa734a60555a1871a008c2a125fe55d564aa1 Merge: 9e33391eb 9603d8af0 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 8 00:36:48 2020 +0000 Merge branch 'maint-0.4.4' changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit 22a7817995226ff9b466df5f87d6c11ecbf06731 Merge: 7759fee48 3e08dd9df Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 8 00:36:47 2020 +0000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit b81e24cda687e9633c18b741ed92ce6bafb77643 Merge: 19d579e8c 3e08dd9df Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 8 00:36:47 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Resolve a compiler warning from a 32-bit signed/unsigned comparison
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 7 14:58:49 2020 -0400 Resolve a compiler warning from a 32-bit signed/unsigned comparison This warning only affects platforms (like win32) with 32-bit time_t. Fixes bug 40028; bugfix on 0.3.2.8-rc. --- changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug40028 b/changes/bug40028 new file mode 100644 index 000000000..cfd1ffe51 --- /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 67a8b49b9..b4a0f8dab 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

1 0

[tor/release-0.4.2] Resolve a compiler warning from a 32-bit signed/unsigned comparison
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 7 14:58:49 2020 -0400 Resolve a compiler warning from a 32-bit signed/unsigned comparison This warning only affects platforms (like win32) with 32-bit time_t. Fixes bug 40028; bugfix on 0.3.2.8-rc. --- changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug40028 b/changes/bug40028 new file mode 100644 index 000000000..cfd1ffe51 --- /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 67a8b49b9..b4a0f8dab 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

1 0

[tor/release-0.4.3] Resolve a compiler warning from a 32-bit signed/unsigned comparison
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 7 14:58:49 2020 -0400 Resolve a compiler warning from a 32-bit signed/unsigned comparison This warning only affects platforms (like win32) with 32-bit time_t. Fixes bug 40028; bugfix on 0.3.2.8-rc. --- changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug40028 b/changes/bug40028 new file mode 100644 index 000000000..cfd1ffe51 --- /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 67a8b49b9..b4a0f8dab 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

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit bd7174bb98af05f05d3220f12e8aec9cd68b3e1a Merge: be3baeb87 b81e24cda Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 8 00:36:48 2020 +0000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0