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

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 2e334d90a655a1047a9caf5ecadd9f0065f2eaab Merge: ff649ec fea93ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 08:19:44 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Limit version numbers to 0...INT32_MAX.
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit cb6b3b7cadb641b648577e5d5536735222cc68da Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 07:57:34 2017 -0500 Limit version numbers to 0...INT32_MAX. Closes 21450; patch from teor. --- changes/bug21450 | 4 ++++ src/or/routerparse.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug21450 b/changes/bug21450 new file mode 100644 index 0000000..a1cf89a --- /dev/null +++ b/changes/bug21450 @@ -0,0 +1,4 @@ + o Minor bugfixes (voting consistency): + - Reject version numbers with components that exceed INT32_MAX. + Otherwise 32-bit and 64-bit platforms would behave inconsistently. + Fixes bug 21450; bugfix on 0.0.8pre1. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index a896dde..c325412 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5605,6 +5605,7 @@ tor_version_parse(const char *s, tor_version_t *out) { char *eos=NULL; const char *cp=NULL; + int ok = 1; /* Format is: * "Tor " ? NUM dot NUM [ dot NUM [ ( pre | rc | dot ) NUM ] ] [ - tag ] */ @@ -5620,7 +5621,9 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ - out->m = (int)strtol(cp, &eos, 10); \ + out->m = (int)tor_parse_uint64(val, 10, 0, INT32_MAX, &ok, &eos); \ + if (!ok) \ + return -1; \ if (!eos || eos == cp) \ return -1; \ cp = eos; \

1 0

[tor/master] Rename make fuzz to make test-fuzz-corpora
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 491348cb8c8fb7cf7d453681871a0f456585af36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 14 18:04:10 2017 -0500 Rename make fuzz to make test-fuzz-corpora --- changes/bug21447 | 4 ++++ doc/HACKING/Fuzzing.md | 5 ++++- src/test/fuzz/include.am | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug21447 b/changes/bug21447 new file mode 100644 index 0000000..c025b92 --- /dev/null +++ b/changes/bug21447 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Rename "make fuzz" to "make test-fuzz-corpora", since it doesn't + actually fuzz anything. Fixes bug 21447; bugfix on 0.3.0.3-alpha. + diff --git a/doc/HACKING/Fuzzing.md b/doc/HACKING/Fuzzing.md index dc23259..16b0b6b 100644 --- a/doc/HACKING/Fuzzing.md +++ b/doc/HACKING/Fuzzing.md @@ -6,7 +6,10 @@ Check out fuzzing-corpora, and set TOR_FUZZ_CORPORA to point to the place where you checked it out. To run the fuzzing test cases in a deterministic fashion, use: - make fuzz + make test-fuzz-corpora + +This won't actually fuzz Tor! It will just run all the fuzz binaries +on our existing set of testcases for the fuzzer. == Different kinds of fuzzing diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index c9c1747..8067108 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -246,5 +246,5 @@ noinst_LIBRARIES += $(OSS_FUZZ_FUZZERS) oss-fuzz-fuzzers: oss-fuzz-prereqs $(OSS_FUZZ_FUZZERS) fuzzers: $(FUZZERS) $(LIBFUZZER_FUZZERS) -fuzz: $(FUZZERS) +test-fuzz-corpora: $(FUZZERS) $(top_srcdir)/src/test/fuzz_static_testcases.sh

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 62f98ad485ac4e05b7680de0b2ed3c5e416c083d Merge: 1fbff41 cb6b3b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 07:58:15 2017 -0500 Merge branch 'maint-0.2.9' changes/bug21450 | 4 ++++ src/or/routerparse.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug21447'
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 39af9fc2b7ed60ed4007cf47a643e30b4c615aae Merge: 62f98ad 491348c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 08:08:25 2017 -0500 Merge branch 'bug21447' changes/bug21447 | 4 ++++ doc/HACKING/Fuzzing.md | 5 ++++- src/test/fuzz/include.am | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[metrics-lib/master] Only create javadoc for api, implements part of task-21469.
by karsten＠torproject.org 15 Feb '17

15 Feb '17

commit b3d4ff1738186b21ba8c118114bcca435d414fa9 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Feb 14 14:29:34 2017 +0000 Only create javadoc for api, implements part of task-21469. --- build.xml | 2 +- src/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index a870eca..cc7a4a7 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="release.version" value="1.5.0-dev" /> <property name="javadoc-title" value="DescripTor API Documentation"/> - <property name="javadoc-excludes" value="**/impl/**" /> + <property name="javadoc-excludes" value="**/impl/** **/index/**" /> <property name="implementation-title" value="DescripTor" /> <property name="name" value="descriptor" /> <property name="jarpatternprop" value="empty" /> diff --git a/src/build b/src/build index bb0e1e5..6940759 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit bb0e1e50ba75dfa15add334706d8ce288fbf2b0b +Subproject commit 6940759436bbd3bdb117572886f6104f78c3b469

1 0

[tor/maint-0.2.9] Limit version numbers to 0...INT32_MAX.
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit cb6b3b7cadb641b648577e5d5536735222cc68da Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 07:57:34 2017 -0500 Limit version numbers to 0...INT32_MAX. Closes 21450; patch from teor. --- changes/bug21450 | 4 ++++ src/or/routerparse.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug21450 b/changes/bug21450 new file mode 100644 index 0000000..a1cf89a --- /dev/null +++ b/changes/bug21450 @@ -0,0 +1,4 @@ + o Minor bugfixes (voting consistency): + - Reject version numbers with components that exceed INT32_MAX. + Otherwise 32-bit and 64-bit platforms would behave inconsistently. + Fixes bug 21450; bugfix on 0.0.8pre1. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index a896dde..c325412 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5605,6 +5605,7 @@ tor_version_parse(const char *s, tor_version_t *out) { char *eos=NULL; const char *cp=NULL; + int ok = 1; /* Format is: * "Tor " ? NUM dot NUM [ dot NUM [ ( pre | rc | dot ) NUM ] ] [ - tag ] */ @@ -5620,7 +5621,9 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ - out->m = (int)strtol(cp, &eos, 10); \ + out->m = (int)tor_parse_uint64(val, 10, 0, INT32_MAX, &ok, &eos); \ + if (!ok) \ + return -1; \ if (!eos || eos == cp) \ return -1; \ cp = eos; \

1 0

[metrics-base/master] Enable exclude patterns, part of task-21469.
by karsten＠torproject.org 15 Feb '17

15 Feb '17

commit 6940759436bbd3bdb117572886f6104f78c3b469 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Feb 14 16:21:32 2017 +0000 Enable exclude patterns, part of task-21469. --- java/base.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java/base.xml b/java/base.xml index 4152cbc..0cafa32 100644 --- a/java/base.xml +++ b/java/base.xml @@ -165,9 +165,7 @@ use="true" windowtitle="${javadoc-title}"> <classpath refid="classpath"/> - <fileset dir="${sources}"> - <exclude name="${javadoc-excludes}"/> - </fileset> + <fileset dir="${sources}" excludes="${javadoc-excludes}"/> </javadoc> <copy file="${javadocicon}" todir="${docs}"/> </target>

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 67877f55add6022c024952d453043b0cb59b75d7 Merge: ed80684 5c42358 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 07:51:48 2017 -0500 Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit 71cd68b66b82aa2103abb0a02359af6c48db84b7 Merge: 1ebdae6 9ff7618 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 07:51:57 2017 -0500 Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8 changes/bug20384 | 10 ---------- 1 file changed, 10 deletions(-)

1 0