April 2014 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Fix a small memory leak when resolving PTR addresses
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit ab1a679eef77520f072e9933ae125dfcf0c228cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 7 23:29:47 2014 -0400 Fix a small memory leak when resolving PTR addresses Fixes bug 11437; bugfix on 0.2.4.7-alpha. Found by coverity; this is CID 1198198. --- changes/bug11437 | 3 +++ src/or/dns.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug11437 b/changes/bug11437 new file mode 100644 index 0000000..f5117ca --- /dev/null +++ b/changes/bug11437 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Stop leaking memory when we successfully resolve a PTR record. + Fixes bug 11437; bugfix on 0.2.4.7-alpha. diff --git a/src/or/dns.c b/src/or/dns.c index f2b7eec..fb1b10d 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1352,6 +1352,7 @@ inform_pending_connections(cached_resolve_t *resolve) } resolve->pending_connections = pend->next; tor_free(pend); + tor_free(hostname); } }

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug11437_024' into maint-0.2.4
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit 47f7085de7a496b6bfa79de9e1b22ca4a28b0f27 Merge: 48578e1 ab1a679 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 8 20:29:24 2014 -0400 Merge remote-tracking branch 'public/bug11437_024' into maint-0.2.4 changes/bug11437 | 3 +++ src/or/dns.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/release-0.2.4] Code to blacklist authority signing keys
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit 50ad3939242885b1a1a11688abd0c9756631747f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 11 10:22:14 2014 -0400 Code to blacklist authority signing keys (I need a list of actual signing keys to blacklist.) --- changes/bug11464_023 | 5 +++++ src/or/networkstatus.c | 11 +++++++++++ src/or/routerlist.c | 22 ++++++++++++++++++++++ src/or/routerlist.h | 1 + src/or/routerparse.c | 8 ++++++++ 5 files changed, 47 insertions(+) diff --git a/changes/bug11464_023 b/changes/bug11464_023 new file mode 100644 index 0000000..a9cd658 --- /dev/null +++ b/changes/bug11464_023 @@ -0,0 +1,5 @@ + o Major features (security): + - Block every authority signing key that was used on an authority + vulnerable to the "heartbleed" bug in openssl (CVE-2014-0160). + (We don't have any evidence that these keys _were_ compromised; + we're doing this to be prudent.) Resolves ticket 11464. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index e780ead..10cc562 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -453,6 +453,17 @@ networkstatus_check_document_signature(const networkstatus_t *consensus, DIGEST_LEN)) return -1; + if (authority_cert_is_blacklisted(cert)) { + /* We implement blacklisting for authority signing keys by treating + * all their signatures as always bad. That way we don't get into + * crazy loops of dropping and re-fetching signatures. */ + log_warn(LD_DIR, "Ignoring a consensus signature made with deprecated" + " signing key %s", + hex_str(cert->signing_key_digest, DIGEST_LEN)); + sig->bad_signature = 1; + return 0; + } + signed_digest_len = crypto_pk_keysize(cert->signing_key); signed_digest = tor_malloc(signed_digest_len); if (crypto_pk_public_checksig(cert->signing_key, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3c39e36..e993e13 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -458,6 +458,28 @@ authority_cert_dl_failed(const char *id_digest, int status) download_status_failed(&cl->dl_status, status); } +static const char *BAD_SIGNING_KEYS[] = { + "----------------------------------------", + NULL, +}; + +/** DOCDOC */ +int +authority_cert_is_blacklisted(const authority_cert_t *cert) +{ + char hex_digest[HEX_DIGEST_LEN+1]; + int i; + base16_encode(hex_digest, sizeof(hex_digest), + cert->signing_key_digest, sizeof(cert->signing_key_digest)); + + for (i = 0; BAD_SIGNING_KEYS[i]; ++i) { + if (!strcasecmp(hex_digest, BAD_SIGNING_KEYS[i])) { + return 1; + } + } + return 0; +} + /** Return true iff when we've been getting enough failures when trying to * download the certificate with ID digest <b>id_digest</b> that we're willing * to start bugging the user about it. */ diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 8dcc6eb..bd55b7b 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -25,6 +25,7 @@ void authority_cert_dl_failed(const char *id_digest, int status); void authority_certs_fetch_missing(networkstatus_t *status, time_t now); int router_reload_router_list(void); int authority_cert_dl_looks_uncertain(const char *id_digest); +int authority_cert_is_blacklisted(const authority_cert_t *cert); smartlist_t *router_get_trusted_dir_servers(void); const routerstatus_t *router_pick_directory_server(dirinfo_type_t type, diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 299d07d..97e0bc8 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3053,6 +3053,14 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, log_warn(LD_DIR,"Mismatch between identities in certificate and vote"); goto err; } + if (ns->type != NS_TYPE_CONSENSUS) { + if (authority_cert_is_blacklisted(ns->cert)) { + log_warn(LD_DIR, "Rejecting vote signature made with blacklisted " + "signing key %s", + hex_str(ns->cert->signing_key_digest, DIGEST_LEN)); + goto err; + } + } voter->address = tor_strdup(tok->args[2]); if (!tor_inet_aton(tok->args[3], &in)) { log_warn(LD_DIR, "Error decoding IP address %s in network-status.",

1 0

[tor/release-0.2.4] Merge branch 'bug11464_023_squashed' into maint-0.2.3
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit 75b4975d7722d9497847fdab8dcfb2ac10f58fdb Merge: 2658e70 09ed8a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 14 17:59:01 2014 -0400 Merge branch 'bug11464_023_squashed' into maint-0.2.3 changes/bug11464_023 | 5 +++++ src/or/networkstatus.c | 11 +++++++++++ src/or/routerlist.c | 33 +++++++++++++++++++++++++++++++++ src/or/routerlist.h | 1 + src/or/routerparse.c | 8 ++++++++ 5 files changed, 58 insertions(+)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit 149931571a4c5ad9ec24eb6d4306e8965a454211 Merge: 47f7085 75b4975 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 14 18:00:38 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/routerlist.h changes/bug11464_023 | 5 +++++ src/or/networkstatus.c | 11 +++++++++++ src/or/routerlist.c | 33 +++++++++++++++++++++++++++++++++ src/or/routerlist.h | 1 + src/or/routerparse.c | 8 ++++++++ 5 files changed, 58 insertions(+) diff --cc src/or/routerlist.c index cb39729,a7968be..b49dc1a --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -600,39 -455,42 +600,72 @@@ authority_cert_dl_failed(const char *id !(cl = digestmap_get(trusted_dir_certs, id_digest))) return; - download_status_failed(&cl->dl_status, status); + /* + * Are we noting a failed download of the latest cert for the id digest, + * or of a download by (id, signing key) digest pair? + */ + if (!signing_key_digest) { + /* Just by id digest */ + download_status_failed(&cl->dl_status_by_id, status); + } else { + /* Reset by (id, signing key) digest pair + * + * Look for a download_status_t in the map with this digest + */ + dlstatus = dsmap_get(cl->dl_status_map, signing_key_digest); + /* Got one? */ + if (dlstatus) { + download_status_failed(dlstatus, status); + } else { + /* + * Do this rather than hex_str(), since hex_str clobbers + * old results and we call twice in the param list. + */ + base16_encode(id_digest_str, sizeof(id_digest_str), + id_digest, DIGEST_LEN); + base16_encode(sk_digest_str, sizeof(sk_digest_str), + signing_key_digest, DIGEST_LEN); + log_warn(LD_BUG, + "Got failure for cert fetch with (fp,sk) = (%s,%s), with " + "status %d, but knew nothing about the download.", + id_digest_str, sk_digest_str, status); + } + } } + static const char *BAD_SIGNING_KEYS[] = { + "09CD84F751FD6E955E0F8ADB497D5401470D697E", // Expires 2015-01-11 16:26:31 + // dizum still needs to rotate as of 2014-04-14 + //"0E7E9C07F0969D0468AD741E172A6109DC289F3C", // Expires 2014-08-12 10:18:26 + // dannenberg still needs to rotate as of 2014-04-14 + //"57B85409891D3FB32137F642FDEDF8B7F8CDFDCD", // Expires 2015-02-11 17:19:09 + "87326329007AF781F587AF5B594E540B2B6C7630", // Expires 2014-07-17 11:10:09 + "98CC82342DE8D298CF99D3F1A396475901E0D38E", // Expires 2014-11-10 13:18:56 + "9904B52336713A5ADCB13E4FB14DC919E0D45571", // Expires 2014-04-20 20:01:01 + "9DCD8E3F1DD1597E2AD476BBA28A1A89F3095227", // Expires 2015-01-16 03:52:30 + "A61682F34B9BB9694AC98491FE1ABBFE61923941", // Expires 2014-06-11 09:25:09 + "B59F6E99C575113650C99F1C425BA7B20A8C071D", // Expires 2014-07-31 13:22:10 + "D27178388FA75B96D37FA36E0B015227DDDBDA51", // Expires 2014-08-04 04:01:57 + NULL, + }; + + /** DOCDOC */ + int + authority_cert_is_blacklisted(const authority_cert_t *cert) + { + char hex_digest[HEX_DIGEST_LEN+1]; + int i; + base16_encode(hex_digest, sizeof(hex_digest), + cert->signing_key_digest, sizeof(cert->signing_key_digest)); + + for (i = 0; BAD_SIGNING_KEYS[i]; ++i) { + if (!strcasecmp(hex_digest, BAD_SIGNING_KEYS[i])) { + return 1; + } + } + return 0; + } + /** Return true iff when we've been getting enough failures when trying to * download the certificate with ID digest <b>id_digest</b> that we're willing * to start bugging the user about it. */ diff --cc src/or/routerlist.h index ce0f0f2,bd55b7b..5056858 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@@ -39,8 -25,8 +39,9 @@@ void authority_cert_dl_failed(const cha void authority_certs_fetch_missing(networkstatus_t *status, time_t now); int router_reload_router_list(void); int authority_cert_dl_looks_uncertain(const char *id_digest); +const smartlist_t *router_get_trusted_dir_servers(void); +const smartlist_t *router_get_fallback_dir_servers(void); + int authority_cert_is_blacklisted(const authority_cert_t *cert); -smartlist_t *router_get_trusted_dir_servers(void); const routerstatus_t *router_pick_directory_server(dirinfo_type_t type, int flags);

1 0

[tor/release-0.2.4] Don't send uninitialized stack to the controller and say it's a date.
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit b2106956e0adc0382f033e1a6cd0896a24122d05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 14 21:51:30 2014 -0400 Don't send uninitialized stack to the controller and say it's a date. Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha. --- changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug11519 b/changes/bug11519 new file mode 100644 index 0000000..5c1e6af --- /dev/null +++ b/changes/bug11519 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid sending an garbage value to the controller when a circuit is + cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ade4224..7218ecc 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1310,7 +1310,7 @@ circuit_launch_by_extend_info(uint8_t purpose, circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { uint8_t old_purpose = circ->_base.purpose; - struct timeval old_timestamp_created; + struct timeval old_timestamp_created = circ->_base.timestamp_created; log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose,

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit b0e1ddbd98038e3c7326970887c74f169701cf35 Merge: 75b4975 b210695 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:48:00 2014 -0400 Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3 changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.4] Update the authority signing key blacklist
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit 2ce0750d21d04c39a5a948b3d96203d8f68ae7ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 16 13:31:40 2014 -0400 Update the authority signing key blacklist Now it only has dannenberg --- src/or/routerlist.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a7968be..afa5861 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -460,10 +460,9 @@ authority_cert_dl_failed(const char *id_digest, int status) static const char *BAD_SIGNING_KEYS[] = { "09CD84F751FD6E955E0F8ADB497D5401470D697E", // Expires 2015-01-11 16:26:31 -// dizum still needs to rotate as of 2014-04-14 -//"0E7E9C07F0969D0468AD741E172A6109DC289F3C", // Expires 2014-08-12 10:18:26 -// dannenberg still needs to rotate as of 2014-04-14 -//"57B85409891D3FB32137F642FDEDF8B7F8CDFDCD", // Expires 2015-02-11 17:19:09 + "0E7E9C07F0969D0468AD741E172A6109DC289F3C", // Expires 2014-08-12 10:18:26 + "57B85409891D3FB32137F642FDEDF8B7F8CDFDCD", // Expires 2015-02-11 17:19:09 +// dannenberg still needs to rotate as of 2014-04-16 "87326329007AF781F587AF5B594E540B2B6C7630", // Expires 2014-07-17 11:10:09 "98CC82342DE8D298CF99D3F1A396475901E0D38E", // Expires 2014-11-10 13:18:56 "9904B52336713A5ADCB13E4FB14DC919E0D45571", // Expires 2014-04-20 20:01:01

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit f3c20a28ab50386064043cc31edb3b1b543d6fc6 Merge: 1499315 b0e1ddb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:51:19 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/circuituse.c changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/circuituse.c index 5984691,7218ecc..c2d2b2e --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -1517,8 -1309,8 +1517,8 @@@ circuit_launch_by_extend_info(uint8_t p * internal circs rather than exit circs? -RD */ circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { - uint8_t old_purpose = circ->_base.purpose; - struct timeval old_timestamp_created = circ->_base.timestamp_created; + uint8_t old_purpose = circ->base_.purpose; - struct timeval old_timestamp_began; ++ struct timeval old_timestamp_began = circ->base_.timestamp_began; log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose,

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 23 Apr '14

23 Apr '14

commit f050cf75b0d963be1aa2840bcef60c8b1e96d3b6 Merge: f3c20a2 2ce0750 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 16 13:32:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/routerlist.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)

1 0