February 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.0] Merge branch 'bug29145_029' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4bc55ed5ee5aefa1d86aca34bc5bfba2f24086f3 Merge: b5f3a3d6a 4417ac880 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:49:20 2019 -0500 Merge branch 'bug29145_029' into maint-0.4.0 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 15e6a03d8,c650b99c8..43754ed1c --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -44,10 -36,11 +44,11 @@@ const char *s = NULL sum += (unsigned char)buf[i]; \ } -#ifdef __OpenBSD__ +#ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ - const char *malloc_options="sufjj"; + extern const char *malloc_options; + const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[tor/maint-0.4.0] Fix a compiler warning on OpenBSD
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4417ac880a7f1306574365fd9cf4da2a41ac14ef Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 21 16:33:32 2019 -0600 Fix a compiler warning on OpenBSD malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug29145 b/changes/bug29145 new file mode 100644 index 000000000..40d3da4b9 --- /dev/null +++ b/changes/bug29145 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, testing): + - Silence a compiler warning in test-memwipe.c on OpenBSD. Fixes + bug 29145; bugfix on 0.2.9.3-alpha. Patch from Kris Katterjohn. diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index fd6457416..c650b99c8 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -39,7 +39,8 @@ const char *s = NULL; #ifdef __OpenBSD__ /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ -const char *malloc_options="sufjj"; +extern const char *malloc_options; +const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit f70929347f084b805fca35107d9f48b4b17b3b33 Merge: 17e29bda5 4bc55ed5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:49:24 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug29145_029' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4bc55ed5ee5aefa1d86aca34bc5bfba2f24086f3 Merge: b5f3a3d6a 4417ac880 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:49:20 2019 -0500 Merge branch 'bug29145_029' into maint-0.4.0 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 15e6a03d8,c650b99c8..43754ed1c --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -44,10 -36,11 +44,11 @@@ const char *s = NULL sum += (unsigned char)buf[i]; \ } -#ifdef __OpenBSD__ +#ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ - const char *malloc_options="sufjj"; + extern const char *malloc_options; + const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[tor/master] Fix a compiler warning on OpenBSD
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4417ac880a7f1306574365fd9cf4da2a41ac14ef Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 21 16:33:32 2019 -0600 Fix a compiler warning on OpenBSD malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug29145 b/changes/bug29145 new file mode 100644 index 000000000..40d3da4b9 --- /dev/null +++ b/changes/bug29145 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, testing): + - Silence a compiler warning in test-memwipe.c on OpenBSD. Fixes + bug 29145; bugfix on 0.2.9.3-alpha. Patch from Kris Katterjohn. diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index fd6457416..c650b99c8 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -39,7 +39,8 @@ const char *s = NULL; #ifdef __OpenBSD__ /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ -const char *malloc_options="sufjj"; +extern const char *malloc_options; +const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[tor/release-0.4.0] Fix a compiler warning on OpenBSD
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4417ac880a7f1306574365fd9cf4da2a41ac14ef Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 21 16:33:32 2019 -0600 Fix a compiler warning on OpenBSD malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug29145 b/changes/bug29145 new file mode 100644 index 000000000..40d3da4b9 --- /dev/null +++ b/changes/bug29145 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, testing): + - Silence a compiler warning in test-memwipe.c on OpenBSD. Fixes + bug 29145; bugfix on 0.2.9.3-alpha. Patch from Kris Katterjohn. diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index fd6457416..c650b99c8 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -39,7 +39,8 @@ const char *s = NULL; #ifdef __OpenBSD__ /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ -const char *malloc_options="sufjj"; +extern const char *malloc_options; +const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[tor/release-0.4.0] Merge branch 'bug29145_029' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4bc55ed5ee5aefa1d86aca34bc5bfba2f24086f3 Merge: b5f3a3d6a 4417ac880 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:49:20 2019 -0500 Merge branch 'bug29145_029' into maint-0.4.0 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 15e6a03d8,c650b99c8..43754ed1c --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -44,10 -36,11 +44,11 @@@ const char *s = NULL sum += (unsigned char)buf[i]; \ } -#ifdef __OpenBSD__ +#ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ - const char *malloc_options="sufjj"; + extern const char *malloc_options; + const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[torspec/master] dir-spec: Fix First-appeared for bandwidth-file-digest
by dgoulet＠torproject.org 19 Feb '19

19 Feb '19

commit 698d6301a409c8ebb2db389d06d2ee8f40d0fa3a Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 19 11:44:50 2019 -0500 dir-spec: Fix First-appeared for bandwidth-file-digest Closes #29147 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index 91d6052..797f4e5 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2160,7 +2160,7 @@ If an authority is configured with a V3BandwidthsFile, but parsing fails, this line SHOULD appear in its vote, with the digest(s) of the unparseable file. - First-appeared: Tor 0.4.0.1-alpha + First-appeared: Tor 0.4.0.2-alpha The authority section of a vote contains the following items, followed in turn by the authority's current key certificate:

1 0

[tor/master] Make test-slow compile with libevent
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 384c5c618835a82d1d5455faff52e3f819683f43 Author: Neel Chauhan <neel(a)neelc.org> Date: Sat Feb 16 16:03:17 2019 -0500 Make test-slow compile with libevent --- src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index 8622fcbaa..9bfc626b2 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -259,7 +259,7 @@ src_test_test_LDADD = \ src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS) src_test_test_slow_LDADD = $(src_test_test_LDADD) -src_test_test_slow_LDFLAGS =@TOR_LDFLAGS_openssl@ +src_test_test_slow_LDFLAGS = @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ src_test_test_rng_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_rng_CFLAGS = $(src_test_test_CFLAGS)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 17e29bda5d4e39e4cb84fa0ad0b011f576b6b6c6 Merge: af36af1a9 b5f3a3d6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:34:25 2019 -0500 Merge branch 'maint-0.4.0' src/test/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0