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

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

26 Feb '19

commit ef12ab83c076069cba2de73f0aec61453949e912 Merge: 39a104993 ef2925e74 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:38:33 2019 +1000 Merge branch 'maint-0.4.0'

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 3ecfb68bd72a6842dd11709e30590271f70ae69f Merge: b83d46feb 6c966b894 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:43 2019 +1000 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit ec49580a74a938ccbe171efd33efde5eec3039bc Merge: 935ac7107 4417ac880 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:27 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf Merge: fb309f6eb 4417ac880 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:36 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 89d946d50,c650b99c8..4beb61369 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -39,10 -36,11 +39,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/release-0.3.5] Fix a compiler warning on OpenBSD
by teor＠torproject.org 26 Feb '19

26 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.3.4] Fix a compiler warning on OpenBSD
by teor＠torproject.org 26 Feb '19

26 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.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf Merge: fb309f6eb 4417ac880 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:36 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 89d946d50,c650b99c8..4beb61369 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -39,10 -36,11 +39,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/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 1a194beb2c01999e08010b44c279cbaaeeadf86c Merge: a56b9501f 6c966b894 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:50 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.3
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf Merge: fb309f6eb 4417ac880 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:36 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 89d946d50,c650b99c8..4beb61369 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -39,10 -36,11 +39,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/release-0.4.0] Merge branch 'maint-0.3.3' into maint-0.3.4
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 1a194beb2c01999e08010b44c279cbaaeeadf86c Merge: a56b9501f 6c966b894 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:50 2019 +1000 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0