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

[tor/maint-0.2.9] Reject Tor versions that contain non-numeric prefixes
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 57154e71aa3b0ff205f2700e97f0ffe4531e1330 Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:38:06 2017 +1100 Reject Tor versions that contain non-numeric prefixes strto* and _atoi64 accept +, -, and various whitespace before numeric characters. And permitted whitespace is different between POSIX and Windows. Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1. --- changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/bug21507 b/changes/bug21507 new file mode 100644 index 0000000..f83e291 --- /dev/null +++ b/changes/bug21507 @@ -0,0 +1,5 @@ + o Minor bugfixes (voting consistency): + - Reject version numbers with non-numeric prefixes (such as +, -, and + whitespace). Disallowing whitespace prevents differential version + parsing between POSIX-based and Windows platforms. + Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2ee0d27..521e237 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5621,6 +5621,8 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ + if (!cp || *cp < '0' || *cp > '9') \ + return -1; \ out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \ if (!ok) \ return -1; \

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit ec9c6d77234809d5bdc06357100ca4bffbbec18c Merge: 4060253 57154e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:03:20 2017 -0400 Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9 changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.3.0] Reject Tor versions that contain non-numeric prefixes
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 57154e71aa3b0ff205f2700e97f0ffe4531e1330 Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:38:06 2017 +1100 Reject Tor versions that contain non-numeric prefixes strto* and _atoi64 accept +, -, and various whitespace before numeric characters. And permitted whitespace is different between POSIX and Windows. Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1. --- changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/bug21507 b/changes/bug21507 new file mode 100644 index 0000000..f83e291 --- /dev/null +++ b/changes/bug21507 @@ -0,0 +1,5 @@ + o Minor bugfixes (voting consistency): + - Reject version numbers with non-numeric prefixes (such as +, -, and + whitespace). Disallowing whitespace prevents differential version + parsing between POSIX-based and Windows platforms. + Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2ee0d27..521e237 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5621,6 +5621,8 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ + if (!cp || *cp < '0' || *cp > '9') \ + return -1; \ out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \ if (!ok) \ return -1; \

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 4c21d4ef7ac0ba0b20ee60322ce177c5f965dc0e Merge: aa5af6a ec9c6d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:03:23 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit ec9c6d77234809d5bdc06357100ca4bffbbec18c Merge: 4060253 57154e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:03:20 2017 -0400 Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9 changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.3.0] Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit ec9c6d77234809d5bdc06357100ca4bffbbec18c Merge: 4060253 57154e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:03:20 2017 -0400 Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9 changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

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

28 Jun '17

commit 912f366bd5597de6da7d48168d1ed1302702cae3 Merge: 054d7c5 4c21d4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:03:23 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/master] Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit ec9c6d77234809d5bdc06357100ca4bffbbec18c Merge: 4060253 57154e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:03:20 2017 -0400 Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9 changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

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

28 Jun '17

commit 912f366bd5597de6da7d48168d1ed1302702cae3 Merge: 054d7c5 4c21d4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:03:23 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

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

28 Jun '17

commit 0f3084c4f2b6018d4f8b5f6d6868c7c3801eb45d Merge: 0c1586d 912f366 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:03:23 2017 -0400 Merge branch 'maint-0.3.1'

1 0