November 2016 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Fetch rbm before running a release build
by sukhbir＠torproject.org 07 Nov '16

07 Nov '16

commit 5181142380a72f90d2beb4946f554d220d00ec5d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Nov 6 23:56:38 2016 -0500 Fetch rbm before running a release build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0e539d1..9335512 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ all: tor-messenger tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686 tor-messenger-osx-x86_64 -tor-messenger-release: +tor-messenger-release: submodule-update $(rbm) build tor-messenger-release tor-mail: tor-mail-linux-x86_64 tor-mail-linux-i686

1 0

[tor-messenger-build/master] Bump version in rbm.conf to 0.3.0b1
by sukhbir＠torproject.org 07 Nov '16

07 Nov '16

commit a317f6027d01ed1db27b175261f695587b18c0fd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Nov 6 23:37:37 2016 -0500 Bump version in rbm.conf to 0.3.0b1 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 7569a12..04d6dc9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,7 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build var: - tormessenger_version: '0.2.0b2' + tormessenger_version: '0.3.0b1' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %]

1 0

[tor/release-0.2.9] Finish a sentence in a comment. Close 20576.
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit f6a3d213e4ace95bbe0361878705d9a889f92974 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:31:50 2016 -0500 Finish a sentence in a comment. Close 20576. --- src/or/protover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index a6a5d18..4d7e9f6 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -12,7 +12,8 @@ * on the supported protocol versions for each relay, and also vote on the * which protocols you should have to support in order to be on the Tor * network. All Tor instances use these required/recommended protocol versions - * to + * to tell what level of support for recent protocols each relay has, and + * to decide whether they should be running given their current protocols. * * The main advantage of these protocol versions numbers over using Tor * version numbers is that they allow different implementations of the Tor

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 27039cbc26ff6a115ed89cf4f0f985c31b2bb9e6 Merge: 9f5cb52 f6a3d21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:32:16 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/or/protover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 4e15c2cb7d905bd981aaae45aa2f186424b33040 Merge: 0b787b1 f6a3d21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:32:21 2016 -0500 Merge branch 'maint-0.2.9' src/or/protover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Finish a sentence in a comment. Close 20576.
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit f6a3d213e4ace95bbe0361878705d9a889f92974 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:31:50 2016 -0500 Finish a sentence in a comment. Close 20576. --- src/or/protover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index a6a5d18..4d7e9f6 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -12,7 +12,8 @@ * on the supported protocol versions for each relay, and also vote on the * which protocols you should have to support in order to be on the Tor * network. All Tor instances use these required/recommended protocol versions - * to + * to tell what level of support for recent protocols each relay has, and + * to decide whether they should be running given their current protocols. * * The main advantage of these protocol versions numbers over using Tor * version numbers is that they allow different implementations of the Tor

1 0

[tor/master] Finish a sentence in a comment. Close 20576.
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit f6a3d213e4ace95bbe0361878705d9a889f92974 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:31:50 2016 -0500 Finish a sentence in a comment. Close 20576. --- src/or/protover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index a6a5d18..4d7e9f6 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -12,7 +12,8 @@ * on the supported protocol versions for each relay, and also vote on the * which protocols you should have to support in order to be on the Tor * network. All Tor instances use these required/recommended protocol versions - * to + * to tell what level of support for recent protocols each relay has, and + * to decide whether they should be running given their current protocols. * * The main advantage of these protocol versions numbers over using Tor * version numbers is that they allow different implementations of the Tor

1 0

[torspec/master] Fix typos and thinkos in prop264. Closes 20577. Thanks, teor!
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 113ea308036f54e7a03d7a0fd0aaed3263bd42b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:30:20 2016 -0500 Fix typos and thinkos in prop264. Closes 20577. Thanks, teor! --- proposals/224-rend-spec-ng.txt | 4 ++-- proposals/264-subprotocol-versions.txt | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 1fe738d..9c4527e 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1755,8 +1755,8 @@ Appendix A. Signature scheme with key blinding [KEYBLIND] Let the basepoint be written as B. Assume B has prime order l, so lB=0. Let a master keypair be written as (a,A), where a is the private - key and A is the public key (A=aB). - + key and A is the public key (A=aB) +. To derive the key for a nonce N and an optional secret s, compute the blinding factor h as H(A | s, B, N), and let: diff --git a/proposals/264-subprotocol-versions.txt b/proposals/264-subprotocol-versions.txt index 8bf1718..5990ef8 100644 --- a/proposals/264-subprotocol-versions.txt +++ b/proposals/264-subprotocol-versions.txt @@ -194,7 +194,8 @@ Implemented-In: 0.2.9.4-alpha The "relay" protocols are those used to handle CREATE cells, and those that handle the various RELAY cell types received after a CREATE cell. (Except, relay cells used to manage introduction and - rendezvous points are managed with the "HSMid" protocols.) + rendezvous points are managed with the "HSIntro" and "HSRend" protocols + respectively.) "1" -- supports the TAP key exchange, with all features in Tor 0.2.3. Support for CREATE and CREATED and CREATE_FAST and @@ -226,7 +227,7 @@ Implemented-In: 0.2.9.4-alpha that can be uploaded to, understood by, and downloaded from a tor relay, and the set of URLs available to fetch them. - "2" -- supports all features in Tor 0.2.0.10-alpha. + "1" -- supports all features in Tor 0.2.0.10-alpha. 5.7. "DirCache" @@ -308,7 +309,8 @@ A.1. Inferring missing proto lines. Tor earlier than 0.2.4.19, so that we can have the protocol list for all current Tor versions include: - DirCache=1 HSDir=1 HSMid=1 Link=1-4 LinkAuth=1 Relay=1-2 + Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1-2 Link=1-4 + LinkAuth=1 Microdesc=1-2 Relay=1-2 For Desc, Tor versions before 0.2.7.stable should be taken to have Desc=1 and versions 0.2.7.stable or later should have Desc=1-2. @@ -377,7 +379,7 @@ A.3. Example integration with other open proposals 189 AUTHORIZE and AUTHORIZED cells This would be a new protocol, either a Link protocol or a new - LinkAuthz protocol. + LinkAuth protocol. 191 Bridge Detection Resistance against MITM-capable Adversaries @@ -431,7 +433,7 @@ A.3. Example integration with other open proposals 224 Next-Generation Hidden Services in Tor - Adds new HSDir and HSMid protocols. + Adds new HSDir and HSIntro and HSRend protocols. 226 "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS" @@ -474,7 +476,7 @@ A.3. Example integration with other open proposals 246 Merging Hidden Service Directories and Introduction Points - Possibly adds a new HSMid protocol. + Possibly adds a new HSIntro or HSDir protocol. 247 Defending Against Guard Discovery Attacks using Vanguards

1 0

[tor/master] Workaround for warning in desc_encode_v3().
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 0b787b1daf68a7da44a5465e4b7afca417761449 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:27:14 2016 -0500 Workaround for warning in desc_encode_v3(). Fixes bug 20581. --- src/or/hs_descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 7c5d204..96db936 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -784,7 +784,7 @@ desc_encode_v3(const hs_descriptor_t *desc, char **encoded_out) /* Build the encrypted data section. */ { - char *enc_b64_blob; + char *enc_b64_blob=NULL; if (encode_encrypted_data(desc, &enc_b64_blob) < 0) { goto err; }

1 0

[tor/master] In test_tortls_classify_client_ciphers(), s/ECDH/ECDHE/
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit def41e93bdcce741c7eb87a06690fb36a133b8bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:23:40 2016 -0500 In test_tortls_classify_client_ciphers(), s/ECDH/ECDHE/ (We weren't actually using these ciphers; we were just requing that ciphers of that name existed.) Patch from rubiate. Fixes 20460 --- changes/20460 | 4 ++++ src/test/test_tortls.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/20460 b/changes/20460 new file mode 100644 index 0000000..d51ec3a --- /dev/null +++ b/changes/20460 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing) + - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has + removed the ECDH ciphers which caused the tests to fail on + platforms which use it. Closes ticket 20460. diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 8efcac2..1cba617 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -834,9 +834,9 @@ test_tortls_classify_client_ciphers(void *ignored) sk_SSL_CIPHER_zero(ciphers); - one = get_cipher_by_name("ECDH-RSA-AES256-GCM-SHA384"); + one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); one->id = 0x00ff; - two = get_cipher_by_name("ECDH-RSA-AES128-GCM-SHA256"); + two = get_cipher_by_name("ECDHE-RSA-AES128-GCM-SHA256"); two->id = 0x0000; sk_SSL_CIPHER_push(ciphers, one); tls->client_cipher_list_type = 0; @@ -906,7 +906,7 @@ test_tortls_client_is_using_v2_ciphers(void *ignored) tt_int_op(ret, OP_EQ, 0); ciphers = sk_SSL_CIPHER_new_null(); - SSL_CIPHER *one = get_cipher_by_name("ECDH-RSA-AES256-GCM-SHA384"); + SSL_CIPHER *one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); one->id = 0x00ff; sk_SSL_CIPHER_push(ciphers, one); sess->ciphers = ciphers; @@ -1551,7 +1551,7 @@ test_tortls_session_secret_cb(void *ignored) tor_tls_session_secret_cb(tls->ssl, NULL, NULL, NULL, NULL, NULL); tt_assert(!tls->ssl->tls_session_secret_cb); - one = get_cipher_by_name("ECDH-RSA-AES256-GCM-SHA384"); + one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); one->id = 0x00ff; ciphers = sk_SSL_CIPHER_new_null(); sk_SSL_CIPHER_push(ciphers, one);

1 0