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

[tor/release-0.3.1] Merge branch 'bug26158_031' into maint-0.3.1
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 Merge: ff70cc84f 94f300762 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/maint-0.3.3] Fix an extra space in a changes file
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index 5ae1c3060..0d74cf116 100644 --- a/changes/bug26158 +++ b/changes/bug26158 @@ -1,4 +1,4 @@ - o Minor bugfixes (relay): + o Minor bugfixes (relay): - Relays now correctly block attempts to re-extend to the previous relay by Ed25519 identity. Previously they would warn in this case, but not actually reject the attempt. Fixes bug 26158; bugfix on

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 049ba66746006e45d8033d8f88f97ba61d8c5631 Merge: 1c80eb92f 6017447e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 7cc3cdef2218d5689f2e51ca475b1c21db1359e5 Merge: 286d02995 ca6d289c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 286d02995ff593cad9414e6755a94221171d9854 Merge: 76e9de7c6 049ba6674 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.1] Add a missing "return -1" when checking for Ed25519 ID loops
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug26158 b/changes/bug26158 new file mode 100644 index 000000000..5ae1c3060 --- /dev/null +++ b/changes/bug26158 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay): + - Relays now correctly block attempts to re-extend to the previous + relay by Ed25519 identity. Previously they would warn in this case, + but not actually reject the attempt. Fixes bug 26158; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 16cef0e56..41ae51a3f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1267,6 +1267,7 @@ circuit_extend(cell_t *cell, circuit_t *circ) log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Client asked me to extend back to the previous hop " "(by Ed25519 ID)."); + return -1; } n_chan = channel_get_for_extend((const char*)ec.node_id,

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit ca6d289c00e5e18b24c7f463e709125e545d4405 Merge: 049ba6674 7e7585d0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Add a missing "return -1" when checking for Ed25519 ID loops
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug26158 b/changes/bug26158 new file mode 100644 index 000000000..5ae1c3060 --- /dev/null +++ b/changes/bug26158 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay): + - Relays now correctly block attempts to re-extend to the previous + relay by Ed25519 identity. Previously they would warn in this case, + but not actually reject the attempt. Fixes bug 26158; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 16cef0e56..41ae51a3f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1267,6 +1267,7 @@ circuit_extend(cell_t *cell, circuit_t *circ) log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Client asked me to extend back to the previous hop " "(by Ed25519 ID)."); + return -1; } n_chan = channel_get_for_extend((const char*)ec.node_id,

1 0

[tor/master] Fix an extra space in a changes file
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 9713ecfc40c9dafaee5a03e469b0d9d701cc6181 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:59:26 2018 -0400 Fix an extra space in a changes file --- changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26158 b/changes/bug26158 index 5ae1c3060..0d74cf116 100644 --- a/changes/bug26158 +++ b/changes/bug26158 @@ -1,4 +1,4 @@ - o Minor bugfixes (relay): + o Minor bugfixes (relay): - Relays now correctly block attempts to re-extend to the previous relay by Ed25519 identity. Previously they would warn in this case, but not actually reject the attempt. Fixes bug 26158; bugfix on

1 0