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

[tor/master] Further clarify our clarification about the type of POSINT
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit f0074372928829835adf6aa2dde9af712097c7c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 19 08:14:59 2019 -0400 Further clarify our clarification about the type of POSINT --- src/lib/conf/conftypes.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index b03234b62..e66ab3d5a 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -73,10 +73,10 @@ typedef enum config_type_t { typedef union { char **STRING; char **FILENAME; - int *POSINT; /* yes, really: Even though the confparse type is called - * "POSINT", it still uses the C int type -- it just enforces - * that the values are in range [0,INT_MAX]. - */ + int *POSINT; /* yes, this is really an int, and not an unsigned int. For + * historical reasons, many configuration values are restricted + * to the range [0,INT_MAX], and stored in signed ints. + */ uint64_t *UINT64; int *INT; int *INTERVAL;

1 0

[tor/master] Merge branch 'tor-github/pr/1116'
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit ef2dd1ba967eb457c3ace590e4a00d14cb6cf854 Merge: 2fce1274d 3e34840a7 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 23 09:46:29 2019 -0400 Merge branch 'tor-github/pr/1116' .gitignore | 2 + Makefile.am | 2 + changes/ticket30864 | 3 + scripts/maint/add_c_file.py | 6 +- scripts/maint/checkSpace.pl | 2 +- src/app/config/confparse.c | 543 ++-------------------------- src/app/config/confparse.h | 65 +--- src/include.am | 2 + src/lib/conf/.may_include | 2 + src/lib/conf/conftypes.h | 99 ++++++ src/lib/conf/include.am | 4 + src/lib/confmgt/.may_include | 9 + src/lib/confmgt/include.am | 23 ++ src/lib/confmgt/type_defs.c | 727 ++++++++++++++++++++++++++++++++++++++ src/lib/confmgt/type_defs.h | 17 + src/lib/confmgt/typedvar.c | 305 ++++++++++++++++ src/lib/confmgt/typedvar.h | 49 +++ src/lib/confmgt/unitparse.c | 206 +++++++++++ src/lib/confmgt/unitparse.h | 34 ++ src/lib/confmgt/var_type_def_st.h | 147 ++++++++ src/lib/encoding/confline.c | 2 +- src/lib/encoding/confline.h | 2 +- src/test/test_confparse.c | 66 +++- src/test/test_options.c | 12 +- 24 files changed, 1739 insertions(+), 590 deletions(-)

1 0

[tor/master] Coverity: different implementation for csiphash
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit f55598f870b2346ed48a32befc51b9a548b8b5fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 28 11:57:36 2019 -0400 Coverity: different implementation for csiphash Coverity has had trouble figuring out our csiphash implementation, and has given spurious warnings about its behavior. This patch changes the csiphash implementation when coverity is in use, so that coverity can figure out that we are not about to read beyond the provided input. Closes ticket 31025. --- changes/ticket31025 | 5 +++++ src/ext/csiphash.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/ticket31025 b/changes/ticket31025 new file mode 100644 index 000000000..c57228823 --- /dev/null +++ b/changes/ticket31025 @@ -0,0 +1,5 @@ + o Minor bugfixes (coverity): + - In our siphash implementation, when building for coverity, use memcpy + in place of a switch statement, so that coverity can tell we are not + accessing out-of-bounds memory. Fixes bug 31025; bugfix on + 0.2.8.1-alpha. This is tracked as CID 1447293 and 1447295. diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index af8559a47..faa52ae4e 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -87,6 +87,13 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k v0 ^= mi; } +#ifdef __COVERITY__ + { + uint64_t mi = 0; + memcpy(&mi, m+i, (src_sz-blocks)); + last7 = _le64toh(mi) | (uint64_t)(src_sz & 0xff) << 56; + } +#else switch (src_sz - blocks) { case 7: last7 |= (uint64_t)m[i + 6] << 48; /* Falls through. */ case 6: last7 |= (uint64_t)m[i + 5] << 40; /* Falls through. */ @@ -98,6 +105,7 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k case 0: default:; } +#endif v3 ^= last7; DOUBLE_ROUND(v0,v1,v2,v3); v0 ^= last7;

1 0

[tor/master] Merge branch 'tor-github/pr/1153'
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit 2fce1274de5bcfd053d6b4b4b5858f6061eb2989 Merge: f7dc920f4 f55598f87 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 23 09:43:36 2019 -0400 Merge branch 'tor-github/pr/1153' changes/ticket31025 | 5 +++++ src/ext/csiphash.c | 8 ++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/maint-0.4.1] Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit 7b05f19801e333702a6100ce6c3bff4b9e756b21 Merge: afa2c39ba 6bc8dedbe Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:36:15 2019 +1000 Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040 This merge removes an incorrect comment about the stem version and commit script. .travis.yml | 24 +++++++++++++++++------- changes/chutney_ci | 3 +++ 2 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit 7541aaf988182d37addb07645f144dae7f3a0443 Merge: 3ccf91027 7b05f1980 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:36:53 2019 +1000 Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041 .travis.yml | 24 +++++++++++++++++------- changes/chutney_ci | 3 +++ 2 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/master] Add a chutney mode to travis.yml.
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit 63325c05964ca5906aad4b51a53a5dc471fc7347 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 27 07:59:39 2019 -0500 Add a chutney mode to travis.yml. --- .travis.yml | 8 +++++++- changes/chutney_ci | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a6727923d..a8ad1f122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,10 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + # We also try running a hardened clang build with chutney on Linux. + - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" + compiler: clang + os: linux ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -142,7 +146,8 @@ install: - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi - ## + ## If we're running chutney, install it. + - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi @@ -155,6 +160,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$CHUTNEY" != "" ]]; then make test-network-all; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi diff --git a/changes/chutney_ci b/changes/chutney_ci new file mode 100644 index 000000000..b17d58732 --- /dev/null +++ b/changes/chutney_ci @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Our Travis configuration now uses Chutney to run some network + integration tests automatically. Closes ticket 29280.

1 0

[tor/maint-0.4.1] Merge branch 'tor-github/pr/1158' into maint-0.4.1
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit c541258fac5544ea3319e6e8e8c712fd70a76cfd Merge: 5e1660100 7541aaf98 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 23 09:39:43 2019 -0400 Merge branch 'tor-github/pr/1158' into maint-0.4.1 .travis.yml | 24 +++++++++++++++++------- changes/chutney_ci | 3 +++ 2 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/master] Travis: control "make check" with its own flag
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit b0826346a64e58b81e00ec6fcb0d2b75b302c0d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 27 07:51:52 2019 -0500 Travis: control "make check" with its own flag Previously we had "make check" launched whenever DISTCHECK was false. Now we'd like to turn it off in a few other circumstances, like running chutney. Maybe stem too? --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 456b5abc5..a6727923d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: ## We run coverage with hardening off, which seems like enough # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -153,7 +153,7 @@ script: - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" ]]; then make check; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi @@ -163,7 +163,7 @@ after_failure: ## But the log is too long for travis' rendered view, so tail it. - tail -1000 config.log || echo "tail failed" ## `make check` will leave a log file with more details of test failures. - - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi

1 0

[tor/master] Travis: show the chutney commit and python version
by dgoulet＠torproject.org 23 Jul '19

23 Jul '19

commit ac7ce179834d8d97342fc17bc385730eccc109a8 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:10:07 2019 +1000 Travis: show the chutney commit and python version Part of 29280. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index cb1351a18..562036e51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,6 +151,10 @@ install: ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi + ## Get python version + - python --version + ## If we're running chutney, show the chutney commit + - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi script: - ./autogen.sh

1 0