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

[tor/master] Fix crash with %include
by nickm＠torproject.org 30 May '17

30 May '17

commit f8ccf8d9a9d7203107c55b73eda7473640fa19a9 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Sun May 28 09:53:14 2017 +0100 Fix crash with %include Fixes crash when including a folder that contains a non-empty file without any values followed by any other non-empty file. --- src/common/confline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/confline.c b/src/common/confline.c index f04b7a8..c2122a1 100644 --- a/src/common/confline.c +++ b/src/common/confline.c @@ -300,7 +300,8 @@ config_process_include(const char *path, int recursion_level, int extended, tor_free(config_file); **next = included_list; - *next = &(*list_last)->next; + if (*list_last) + *next = &(*list_last)->next; } SMARTLIST_FOREACH_END(config_file); smartlist_free(config_files);

1 0

[tor/master] Replace 3-star pointer with 2-star pointer
by nickm＠torproject.org 30 May '17

30 May '17

commit 94d321120e55b67880d5a934b1d5e0332acfeaf7 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Sun May 28 20:24:48 2017 +0100 Replace 3-star pointer with 2-star pointer --- src/common/confline.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/common/confline.c b/src/common/confline.c index c2122a1..691cbf8 100644 --- a/src/common/confline.c +++ b/src/common/confline.c @@ -19,7 +19,7 @@ static int config_get_included_list(const char *path, int recursion_level, int extended, config_line_t **list, config_line_t **list_last); static int config_process_include(const char *path, int recursion_level, - int extended, config_line_t ***next, + int extended, config_line_t **list, config_line_t **list_last); /** Helper: allocate a new configuration option mapping 'key' to 'val', @@ -132,7 +132,8 @@ config_get_lines_aux(const char *string, config_line_t **result, int extended, tor_free(k); include_used = 1; - if (config_process_include(v, recursion_level, extended, &next, + config_line_t *include_list; + if (config_process_include(v, recursion_level, extended, &include_list, &list_last) < 0) { log_warn(LD_CONFIG, "Error reading included configuration " "file or directory: \"%s\".", v); @@ -140,6 +141,9 @@ config_get_lines_aux(const char *string, config_line_t **result, int extended, tor_free(v); return -1; } + *next = include_list; + if (list_last) + next = &list_last->next; tor_free(v); } else { /* This list can get long, so we keep a pointer to the end of it @@ -262,14 +266,15 @@ config_get_included_list(const char *path, int recursion_level, int extended, return 0; } -/** Process an %include path in a config file. Set next to a - * pointer to the next pointer of the last element of the config_line_t list - * obtained from the config file and list_last to the last element of - * the same list. Return 0 on success, -1 on failure. */ +/** Process an %include path in a config file. Set list to the + * list of configuration settings obtained and list_last to the last + * element of the same list. Return 0 on success, -1 on failure. */ static int config_process_include(const char *path, int recursion_level, int extended, - config_line_t ***next, config_line_t **list_last) + config_line_t **list, config_line_t **list_last) { + config_line_t *ret_list = NULL; + config_line_t **next = &ret_list; #if 0 // Disabled -- we already unescape_string() on the result. */ char *unquoted_path = get_unquoted_path(path); @@ -299,12 +304,13 @@ config_process_include(const char *path, int recursion_level, int extended, } tor_free(config_file); - **next = included_list; + *next = included_list; if (*list_last) - *next = &(*list_last)->next; + next = &(*list_last)->next; } SMARTLIST_FOREACH_END(config_file); smartlist_free(config_files); + *list = ret_list; return 0; }

1 0

[tor/master] Merge remote-tracking branch 'jigsaw/fix-22417-without-3-star'
by nickm＠torproject.org 30 May '17

30 May '17

commit 184d889f8ac7a004050a1d3d0c5981d6518410c0 Merge: f9615f9 94d3211 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 30 08:47:14 2017 -0400 Merge remote-tracking branch 'jigsaw/fix-22417-without-3-star' src/common/confline.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)

1 0

[tor/master] changes file for 22417
by nickm＠torproject.org 30 May '17

30 May '17

commit 6bc9ff87b8a9ed4bd765c238c5d27984b4149302 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 30 08:48:50 2017 -0400 changes file for 22417 --- changes/bug22417 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug22417 b/changes/bug22417 new file mode 100644 index 0000000..88c601a --- /dev/null +++ b/changes/bug22417 @@ -0,0 +1,3 @@ + o Major bugfixes (torrc, crash): + - Fix a crash bug when using %include in torrc. Fixes bug 22417; + bugfix on 0.3.1.1-alpha. Patch by Daniel Pinto.

1 0

[torspec/master] prop224: Add string constant to blinding factor calculation.
by nickm＠torproject.org 30 May '17

30 May '17

commit ec3802145b280bd19ae635ac567a9c24dfb874dd Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 25 17:44:50 2017 +0300 prop224: Add string constant to blinding factor calculation. Also simplify that part of the spec sincedgoulet felt it was too obscure and people might miss it or consider it a side note. --- proposals/224-rend-spec-ng.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 2156f39..f8e131c 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1995,6 +1995,8 @@ References: Appendix A. Signature scheme with key blinding [KEYBLIND] +A.1. Key derivation overview + As described in [IMD:DIST] and [SUBCRED] above, we require a "key blinding" system that works (roughly) as follows: @@ -2022,6 +2024,7 @@ Appendix A. Signature scheme with key blinding [KEYBLIND] [TODO: Insert a more rigorous definition and better references.] +A.2. Tor's key derivation scheme We propose the following scheme for key blinding, based on Ed25519. @@ -2035,7 +2038,13 @@ Appendix A. Signature scheme with key blinding [KEYBLIND] 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: + blinding factor like this: + + h = H(BLIND_STRING | A | s | B | N) + BLIND_STRING = "Derive temporary signing key" + N = "key-blind" | INT_8(period-number) | INT_8(period_length) + + and then do the following: private key for the period: a' = h a public key for the period: A' = h A = (ha)B @@ -2055,9 +2064,6 @@ Appendix A. Signature scheme with key blinding [KEYBLIND] possible alternatives. Also, see [KEYBLIND-PROOF] for a security proof of this scheme. - (To use this with Tor, set N = "key-blind" | INT_8(period-number) | - INT_8(period_length).) - Appendix B. Selecting nodes [PICKNODES] Picking introduction points

1 0

[torspec/master] prop224: Hash time period length wherever we use period_num.
by nickm＠torproject.org 30 May '17

30 May '17

commit af547b7855183447e1eb194961f8914c32e47d94 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 25 17:42:24 2017 +0300 prop224: Hash time period length wherever we use period_num. See review point: https://gitlab.com/dgoulet/tor/merge_requests/27#note_27696937 --- proposals/224-rend-spec-ng.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 8945239..2156f39 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -784,17 +784,20 @@ Table of contents: hs_index(replicanum) = H("store-at-idx" | blinded_public_key | INT_8(replicanum) | + INT_8(period_length) | INT_8(period_num) ) - where blinded_public_key is specified in section [KEYBLIND], and period_num - is calculated using the current consensus "valid-after" as specified in - section [TIME-PERIODS]. + where blinded_public_key is specified in section [KEYBLIND], period_length + is the length of the time period in minutes, and period_num is calculated + using the current consensus "valid-after" as specified in section + [TIME-PERIODS]. Then, for each node listed in the current consensus with the HSDirV3 flag, we compute a directory index for that node as: hsdir_index(node) = H("node-idx" | node_identity | shared_random_value | + INT_8(period_length) | INT_8(period_num) ) where shared_random_value is the shared value generated by the authorities @@ -903,10 +906,11 @@ Table of contents: To do so, Tor clients and services use: - SRV = H("shared-random-disaster" | INT_8(period_num)) + SRV = H("shared-random-disaster" | INT_8(period_length) | INT_8(period_num)) - where period_num is calculated as specified in [TIME-PERIODS] for the - wanted shared random value that could not be found originally. + where period_length is the length of a time period in minutes, period_num is + calculated as specified in [TIME-PERIODS] for the wanted shared random value + that could not be found originally. 2.3.2. Hidden services and changing shared random values @@ -2052,7 +2056,7 @@ Appendix A. Signature scheme with key blinding [KEYBLIND] proof of this scheme. (To use this with Tor, set N = "key-blind" | INT_8(period-number) | - INT_8(Start of period in seconds since epoch).) + INT_8(period_length).) Appendix B. Selecting nodes [PICKNODES]

1 0

[torspec/master] prop224: Remove KH from ntor key derivation.
by nickm＠torproject.org 30 May '17

30 May '17

commit c8e256400689fd19f4c429349f532ab21cb7583e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 23 15:48:21 2017 +0300 prop224: Remove KH from ntor key derivation. We don't need KH anymore since we do a MAC check anyway. --- proposals/224-rend-spec-ng.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index f8e131c..6f16fce 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1857,12 +1857,11 @@ Table of contents: NTOR_KEY_SEED part of the handshake output. To do so, they use the KDF construction as follows: - K = KDF(NTOR_KEY_SEED | m_hsexpand, HASH_LEN * 3 + S_KEY_LEN * 2) + K = KDF(NTOR_KEY_SEED | m_hsexpand, HASH_LEN * 2 + S_KEY_LEN * 2) - The first HASH_LEN bytes of K form KH; the next HASH_LEN form the forward - digest Df; the next HASH_LEN bytes form the backward digest Db; the next - S_KEY_LEN bytes form Kf, and the final S_KEY_LEN bytes form Kb. Excess - bytes from K are discarded. + The first HASH_LEN bytes of K form the forward digest Df; the next HASH_LEN + bytes form the backward digest Db; the next S_KEY_LEN bytes form Kf, and the + final S_KEY_LEN bytes form Kb. Excess bytes from K are discarded. Subsequently, the rendezvous point passes relay cells, unchanged, from each of the two circuits to the other. When Alice's OP sends RELAY cells along

1 0

[torspec/master] prop224: Specify blinding factor clamping.
by nickm＠torproject.org 30 May '17

30 May '17

commit 6d0b14fea3c2cf96c625203debb4416c6b7896d7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 25 16:03:46 2017 +0300 prop224: Specify blinding factor clamping. --- proposals/224-rend-spec-ng.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 6f16fce..247af87 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -2043,7 +2043,13 @@ A.2. Tor's key derivation scheme BLIND_STRING = "Derive temporary signing key" N = "key-blind" | INT_8(period-number) | INT_8(period_length) - and then do the following: + then clamp the blinding factor 'h' according to the ed25519 spec: + + h[0] &= 248; + h[31] &= 127; + h[31] |= 64; + + and do the key derivation as follows: private key for the period: a' = h a public key for the period: A' = h A = (ha)B

1 0

[torspec/master] Merge remote-tracking branch 'asn/bug22052'
by nickm＠torproject.org 30 May '17

30 May '17

commit 32fcd66b5a0abe4f9505f25f8a8da6d65407e423 Merge: c07abd0 6d0b14f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 30 08:43:34 2017 -0400 Merge remote-tracking branch 'asn/bug22052' proposals/224-rend-spec-ng.txt | 45 ++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 15 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/bug22421'
by nickm＠torproject.org 30 May '17

30 May '17

commit f9615f9d770e035829e1ff238980d6ac6e852150 Merge: 167e5be 25ea8be Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 30 08:42:20 2017 -0400 Merge remote-tracking branch 'teor/bug22421' src/or/config.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0