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

[goptlib/master] Use switch for keywordIsSafe.
by dcf＠torproject.org 26 Jun '17

26 Jun '17

commit 24207cb5ab5c782d70e29a837c8aeef8e01d61f5 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jun 26 16:48:59 2017 -0700 Use switch for keywordIsSafe. --- pt.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pt.go b/pt.go index 6b0dd09..39e6aca 100644 --- a/pt.go +++ b/pt.go @@ -217,19 +217,18 @@ func getenvRequired(key string) (string, error) { // <KeywordChar> ::= <any US-ASCII alphanumeric, dash, and underscore> func keywordIsSafe(keyword string) bool { for _, b := range []byte(keyword) { - if b >= '0' && b <= '9' { + switch { + case b >= '0' && b <= '9': continue - } - if b >= 'A' && b <= 'Z' { + case b >= 'A' && b <= 'Z': continue - } - if b >= 'a' && b <= 'z' { + case b >= 'a' && b <= 'z': continue - } - if b == '-' || b == '_' { + case b == '-' || b == '_': continue + default: + return false } - return false } return true }

1 0

[goptlib/master] Add a test for TestKeywordIsSafe with unsafe in first position.
by dcf＠torproject.org 26 Jun '17

26 Jun '17

commit 8838202811d5f532c99efcd4312a18bafad1c84f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jun 26 16:47:16 2017 -0700 Add a test for TestKeywordIsSafe with unsafe in first position. --- pt_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pt_test.go b/pt_test.go index 069647c..f9f4790 100644 --- a/pt_test.go +++ b/pt_test.go @@ -53,6 +53,7 @@ func TestKeywordIsSafe(t *testing.T) { {"CMETHOD\x80", false}, {"CMETHOD\x81", false}, {"CMETHOD\xff", false}, + {"\xffCMETHOD", false}, {"CMÉTHOD", false}, }

1 0

[goptlib/master] Put byte ranges in order.
by dcf＠torproject.org 26 Jun '17

26 Jun '17

commit a3ad5df6c9e7dc8117f55958b4ce99bf1e0fe291 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jun 26 16:50:26 2017 -0700 Put byte ranges in order. --- pt.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt.go b/pt.go index 39e6aca..cc0ed8c 100644 --- a/pt.go +++ b/pt.go @@ -218,11 +218,11 @@ func getenvRequired(key string) (string, error) { func keywordIsSafe(keyword string) bool { for _, b := range []byte(keyword) { switch { - case b >= '0' && b <= '9': + case '0' <= b && b <= '9': continue - case b >= 'A' && b <= 'Z': + case 'A' <= b && b <= 'Z': continue - case b >= 'a' && b <= 'z': + case 'a' <= b && b <= 'z': continue case b == '-' || b == '_': continue

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit f6df433b9123c50b8eda6d8784d4f96be6d02f51 Merge: c29a559 3259601 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 14:30:21 2017 -0400 Merge branch 'maint-0.3.1' src/test/fuzz/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'bug22105_031' into maint-0.3.1
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 32596016a2a16fcbfa9b201b2f3a5437a46dad17 Merge: d72cfb2 1721487 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 14:30:17 2017 -0400 Merge branch 'bug22105_031' into maint-0.3.1 src/test/fuzz/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Remove hardwired libfuzzer path; closes 22105.
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 1721487beae7c11e97751cb087424336ac516692 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 15:35:46 2017 -0400 Remove hardwired libfuzzer path; closes 22105. --- src/test/fuzz/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index 6008238..2961dab 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -36,7 +36,7 @@ oss-fuzz-prereqs: \ noinst_HEADERS += \ src/test/fuzz/fuzzing.h -LIBFUZZER = /home/nickm/build/libfuzz/libFuzzer.a +LIBFUZZER = -lFuzzer LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS) LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG)

1 0

[tor/maint-0.3.1] Remove hardwired libfuzzer path; closes 22105.
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 1721487beae7c11e97751cb087424336ac516692 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 15:35:46 2017 -0400 Remove hardwired libfuzzer path; closes 22105. --- src/test/fuzz/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index 6008238..2961dab 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -36,7 +36,7 @@ oss-fuzz-prereqs: \ noinst_HEADERS += \ src/test/fuzz/fuzzing.h -LIBFUZZER = /home/nickm/build/libfuzz/libFuzzer.a +LIBFUZZER = -lFuzzer LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS) LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG)

1 0

[tor/master] Merge branch 'bug22105_031' into maint-0.3.1
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 32596016a2a16fcbfa9b201b2f3a5437a46dad17 Merge: d72cfb2 1721487 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 14:30:17 2017 -0400 Merge branch 'bug22105_031' into maint-0.3.1 src/test/fuzz/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Remove hardwired libfuzzer path; closes 22105.
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 1721487beae7c11e97751cb087424336ac516692 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 15:35:46 2017 -0400 Remove hardwired libfuzzer path; closes 22105. --- src/test/fuzz/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index 6008238..2961dab 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -36,7 +36,7 @@ oss-fuzz-prereqs: \ noinst_HEADERS += \ src/test/fuzz/fuzzing.h -LIBFUZZER = /home/nickm/build/libfuzz/libFuzzer.a +LIBFUZZER = -lFuzzer LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS) LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG)

1 0

[tor/release-0.3.1] Merge branch 'bug22105_031' into maint-0.3.1
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 32596016a2a16fcbfa9b201b2f3a5437a46dad17 Merge: d72cfb2 1721487 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 14:30:17 2017 -0400 Merge branch 'bug22105_031' into maint-0.3.1 src/test/fuzz/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0