tor-commits September 2011

tor-commits@lists.torproject.org

19 participants
865 discussions

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b Merge: d3ff167 b0695c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 9 12:58:12 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: configure.in src/or/circuitbuild.c changes/bug3894 | 4 ++ changes/replay-firstpart | 13 +++++++ configure.in | 2 + src/common/torgzip.c | 3 +- src/common/util.c | 8 +++-- src/or/circuitbuild.c | 12 +++--- src/or/control.c | 4 +- src/or/relay.c | 2 +- src/or/rendservice.c | 26 +++++++++++++-- src/or/rephist.c | 4 +- src/or/routerlist.c | 10 +++--- src/or/routerparse.c | 82 +++++++++++++++++++++++----------------------- src/test/test.c | 4 +- 13 files changed, 108 insertions(+), 66 deletions(-) diff --cc configure.in index 824547c,047545d..a449136 --- a/configure.in +++ b/configure.in @@@ -286,28 -229,7 +286,30 @@@ dnl ----------------------------------- dnl Check for functions before libevent, since libevent-1.2 apparently dnl exports strlcpy without defining it in a header. -AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull getaddrinfo localtime_r gmtime_r memmem strtok_r writev readv flock prctl vasprintf lround rint) +AC_CHECK_FUNCS( + accept4 \ + flock \ + ftime \ + getaddrinfo \ + getrlimit \ + gettimeofday \ + gmtime_r \ + inet_aton \ + localtime_r \ ++ lround \ + memmem \ + prctl \ ++ rint \ + socketpair \ + strlcat \ + strlcpy \ + strptime \ + strtok_r \ + strtoull \ + sysconf \ + uname \ + vasprintf \ +) using_custom_malloc=no if test x$enable_openbsd_malloc = xyes ; then

1 0

[tor/master] Switch a SMARTLIST_FOREACH in circuitbuild.c to BEGIN/END
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 561ab14a5ed64dd3994fe23073e74efa3498e589 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 30 20:35:17 2011 -0400 Switch a SMARTLIST_FOREACH in circuitbuild.c to BEGIN/END It had some cpp stuff inside, and older GCCs don't like preprocessor directives inside macro arguments. Found by grarpamp. --- src/or/circuitbuild.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a63e89b..3c1f63a 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4095,7 +4095,7 @@ choose_random_entry(cpath_build_state_t *state) retry: smartlist_clear(live_entry_guards); - SMARTLIST_FOREACH(entry_guards, entry_guard_t *, entry, + SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) { const char *msg; r = entry_is_live(entry, need_uptime, need_capacity, 0, &msg); @@ -4131,7 +4131,8 @@ choose_random_entry(cpath_build_state_t *state) } if (smartlist_len(live_entry_guards) >= options->NumEntryGuards) break; /* we have enough */ - }); + } + SMARTLIST_FOREACH_END(entry); if (entry_list_is_constrained(options)) { /* If we prefer the entry nodes we've got, and we have at least

1 0

[tor/master] Fix a compilation issue on older FreeBSDs
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 03760f6c6f0c580542c8bfc519062b65afdc8d5f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 30 20:45:49 2011 -0400 Fix a compilation issue on older FreeBSDs --- src/common/torgzip.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 2937c67..a26e5b2 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -14,11 +14,12 @@ #include <stdio.h> #include <assert.h> #include <string.h> +#include "torint.h" + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include "torint.h" #include "util.h" #include "torlog.h" #include "torgzip.h"

1 0

[tor/master] Use %f with printf-style formatting, not %lf
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 393e4fb5b5529c666438ef04ebd076f90dd287fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 30 20:42:51 2011 -0400 Use %f with printf-style formatting, not %lf For printf, %f and %lf are synonymous, since floats are promoted to doubles when passed as varargs. It's only for scanf that we need to say "%lf" for doubles and "%f" for floats. Apparenly, some older compilers think it's naughty to say %lf and like to spew warnings about it. Found by grarpamp. --- src/or/circuitbuild.c | 12 +++--- src/or/control.c | 4 +- src/or/relay.c | 2 +- src/or/rephist.c | 4 +- src/or/routerlist.c | 10 +++--- src/or/routerparse.c | 82 ++++++++++++++++++++++++------------------------ src/test/test.c | 4 +- 7 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 3c1f63a..c6be46d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1237,7 +1237,7 @@ circuit_build_times_network_check_changed(circuit_build_times_t *cbt) if (cbt->timeout_ms >= circuit_build_times_get_initial_timeout()) { if (cbt->timeout_ms > INT32_MAX/2 || cbt->close_ms > INT32_MAX/2) { log_warn(LD_CIRC, "Insanely large circuit build timeout value. " - "(timeout = %lfmsec, close = %lfmsec)", + "(timeout = %fmsec, close = %fmsec)", cbt->timeout_ms, cbt->close_ms); } else { cbt->timeout_ms *= 2; @@ -1414,7 +1414,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) return; if (cbt->timeout_ms < circuit_build_times_min_timeout()) { - log_warn(LD_CIRC, "Set buildtimeout to low value %lfms. Setting to %dms", + log_warn(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms", cbt->timeout_ms, circuit_build_times_min_timeout()); cbt->timeout_ms = circuit_build_times_min_timeout(); if (cbt->close_ms < cbt->timeout_ms) { @@ -1436,7 +1436,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) cbt->total_build_times, tor_lround(cbt->timeout_ms/1000)); log_info(LD_CIRC, - "Circuit timeout data: %lfms, %lfms, Xm: %d, a: %lf, r: %lf", + "Circuit timeout data: %fms, %fms, Xm: %d, a: %f, r: %f", cbt->timeout_ms, cbt->close_ms, cbt->Xm, cbt->alpha, timeout_rate); } else if (prev_timeout < tor_lround(cbt->timeout_ms/1000)) { @@ -1447,13 +1447,13 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) cbt->total_build_times, tor_lround(cbt->timeout_ms/1000)); log_info(LD_CIRC, - "Circuit timeout data: %lfms, %lfms, Xm: %d, a: %lf, r: %lf", + "Circuit timeout data: %fms, %fms, Xm: %d, a: %f, r: %f", cbt->timeout_ms, cbt->close_ms, cbt->Xm, cbt->alpha, timeout_rate); } else { log_info(LD_CIRC, - "Set circuit build timeout to %lds (%lfms, %lfms, Xm: %d, a: %lf," - " r: %lf) based on %d circuit times", + "Set circuit build timeout to %lds (%fms, %fms, Xm: %d, a: %f," + " r: %f) based on %d circuit times", tor_lround(cbt->timeout_ms/1000), cbt->timeout_ms, cbt->close_ms, cbt->Xm, cbt->alpha, timeout_rate, cbt->total_build_times); diff --git a/src/or/control.c b/src/or/control.c index de9dca0..1e411ec 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3712,8 +3712,8 @@ control_event_buildtimeout_set(const circuit_build_times_t *cbt, send_control_event(EVENT_BUILDTIMEOUT_SET, ALL_FORMATS, "650 BUILDTIMEOUT_SET %s TOTAL_TIMES=%lu " - "TIMEOUT_MS=%lu XM=%lu ALPHA=%lf CUTOFF_QUANTILE=%lf " - "TIMEOUT_RATE=%lf CLOSE_MS=%lu CLOSE_RATE=%lf\r\n", + "TIMEOUT_MS=%lu XM=%lu ALPHA=%f CUTOFF_QUANTILE=%f " + "TIMEOUT_RATE=%f CLOSE_MS=%lu CLOSE_RATE=%f\r\n", type_string, (unsigned long)cbt->total_build_times, (unsigned long)cbt->timeout_ms, (unsigned long)cbt->Xm, cbt->alpha, qnt, diff --git a/src/or/relay.c b/src/or/relay.c index 46e8522..d9b9d0c 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2028,7 +2028,7 @@ cell_ewma_set_scale_factor(or_options_t *options, networkstatus_t *consensus) ewma_enabled = 1; log_info(LD_OR, "Enabled cell_ewma algorithm because of value in %s; " - "scale factor is %lf per %d seconds", + "scale factor is %f per %d seconds", source, ewma_scale_factor, EWMA_TICK_LEN); } } diff --git a/src/or/rephist.c b/src/or/rephist.c index 2444700..1dd3d94 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -445,7 +445,7 @@ rep_hist_downrate_old_runs(time_t now) alpha *= STABILITY_ALPHA; } - log_info(LD_HIST, "Discounting all old stability info by a factor of %lf", + log_info(LD_HIST, "Discounting all old stability info by a factor of %f", alpha); /* Multiply every w_r_l, t_r_w pair by alpha. */ @@ -893,7 +893,7 @@ rep_hist_format_router_status(or_history_t *hist, time_t now) " weighted-uptime %lu\n" "mtbf %0.1lf\n" " weighted-run-length %lu\n" - " total-run-weights %lf\n", + " total-run-weights %f\n", up?"uptime-started ":"", up?sor_buf:"", up?" UTC\n":"", down?"downtime-started ":"", down?sod_buf:"", down?" UTC\n":"", wfu, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 47a57a8..f8df089 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1815,7 +1815,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl, sl_last_total_weighted_bw = weighted_bw; log_debug(LD_CIRC, "Choosing node for rule %s based on weights " - "Wg=%lf Wm=%lf We=%lf Wd=%lf with total bw %lf", + "Wg=%f Wm=%f We=%f Wd=%f with total bw %f", bandwidth_weight_rule_to_string(rule), Wg, Wm, We, Wd, weighted_bw); @@ -1824,7 +1824,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl, /* Don't warn when using bridges/relays not in the consensus */ if (!have_unknown) log_warn(LD_CIRC, - "Weighted bandwidth is %lf in node selection for rule %s", + "Weighted bandwidth is %f in node selection for rule %s", weighted_bw, bandwidth_weight_rule_to_string(rule)); tor_free(bandwidths); return smartlist_choose(sl); @@ -1849,7 +1849,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl, --i; log_warn(LD_BUG, "Round-off error in computing bandwidth had an effect on " " which router we chose. Please tell the developers. " - "%lf " U64_FORMAT " %lf", tmp, U64_PRINTF_ARG(rand_bw), + "%f " U64_FORMAT " %f", tmp, U64_PRINTF_ARG(rand_bw), weighted_bw); } tor_free(bandwidths); @@ -2074,10 +2074,10 @@ smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule, log_debug(LD_CIRC, "Total weighted bw = "U64_FORMAT ", exit bw = "U64_FORMAT - ", nonexit bw = "U64_FORMAT", exit weight = %lf " + ", nonexit bw = "U64_FORMAT", exit weight = %f " "(for exit == %d)" ", guard bw = "U64_FORMAT - ", nonguard bw = "U64_FORMAT", guard weight = %lf " + ", nonguard bw = "U64_FORMAT", guard weight = %f " "(for guard == %d)", U64_PRINTF_ARG(total_bw), U64_PRINTF_ARG(total_exit_bw), U64_PRINTF_ARG(total_nonexit_bw), diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 42dbcac..aed4fd1 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2419,40 +2419,40 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) // We use > 1 as the check for these because they are computed as integers. // Sometimes there are rounding errors. if (fabs(Wmm - weight_scale) > 1) { - log_warn(LD_BUG, "Wmm=%lf != "I64_FORMAT, + log_warn(LD_BUG, "Wmm=%f != "I64_FORMAT, Wmm, I64_PRINTF_ARG(weight_scale)); valid = 0; } if (fabs(Wem - Wee) > 1) { - log_warn(LD_BUG, "Wem=%lf != Wee=%lf", Wem, Wee); + log_warn(LD_BUG, "Wem=%f != Wee=%f", Wem, Wee); valid = 0; } if (fabs(Wgm - Wgg) > 1) { - log_warn(LD_BUG, "Wgm=%lf != Wgg=%lf", Wgm, Wgg); + log_warn(LD_BUG, "Wgm=%f != Wgg=%f", Wgm, Wgg); valid = 0; } if (fabs(Weg - Wed) > 1) { - log_warn(LD_BUG, "Wed=%lf != Weg=%lf", Wed, Weg); + log_warn(LD_BUG, "Wed=%f != Weg=%f", Wed, Weg); valid = 0; } if (fabs(Wgg + Wmg - weight_scale) > 0.001*weight_scale) { - log_warn(LD_BUG, "Wgg=%lf != "I64_FORMAT" - Wmg=%lf", Wgg, + log_warn(LD_BUG, "Wgg=%f != "I64_FORMAT" - Wmg=%f", Wgg, I64_PRINTF_ARG(weight_scale), Wmg); valid = 0; } if (fabs(Wee + Wme - weight_scale) > 0.001*weight_scale) { - log_warn(LD_BUG, "Wee=%lf != "I64_FORMAT" - Wme=%lf", Wee, + log_warn(LD_BUG, "Wee=%f != "I64_FORMAT" - Wme=%f", Wee, I64_PRINTF_ARG(weight_scale), Wme); valid = 0; } if (fabs(Wgd + Wmd + Wed - weight_scale) > 0.001*weight_scale) { - log_warn(LD_BUG, "Wgd=%lf + Wmd=%lf + Wed=%lf != "I64_FORMAT, + log_warn(LD_BUG, "Wgd=%f + Wmd=%f + Wed=%f != "I64_FORMAT, Wgd, Wmd, Wed, I64_PRINTF_ARG(weight_scale)); valid = 0; } @@ -2507,10 +2507,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) casename = "Case 1"; if (fabs(Etotal-Mtotal) > 0.01*MAX(Etotal,Mtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Etotal %lf != Mtotal %lf. " + "Bw Weight Failure for %s: Etotal %f != Mtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Etotal, Mtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2519,10 +2519,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } if (fabs(Etotal-Gtotal) > 0.01*MAX(Etotal,Gtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Etotal %lf != Gtotal %lf. " + "Bw Weight Failure for %s: Etotal %f != Gtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Etotal, Gtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2531,10 +2531,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } if (fabs(Gtotal-Mtotal) > 0.01*MAX(Gtotal,Mtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Mtotal %lf != Gtotal %lf. " + "Bw Weight Failure for %s: Mtotal %f != Gtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Mtotal, Gtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2563,10 +2563,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) // Rtotal < Stotal if (Rtotal > Stotal) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Rtotal %lf > Stotal %lf. " + "Bw Weight Failure for %s: Rtotal %f > Stotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Rtotal, Stotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2576,10 +2576,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) // Rtotal < T/3 if (3*Rtotal > T) { log_warn(LD_DIR, - "Bw Weight Failure for %s: 3*Rtotal %lf > T " + "Bw Weight Failure for %s: 3*Rtotal %f > T " I64_FORMAT". G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT " D="I64_FORMAT" T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Rtotal*3, I64_PRINTF_ARG(T), I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2589,10 +2589,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) // Stotal < T/3 if (3*Stotal > T) { log_warn(LD_DIR, - "Bw Weight Failure for %s: 3*Stotal %lf > T " + "Bw Weight Failure for %s: 3*Stotal %f > T " I64_FORMAT". G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT " D="I64_FORMAT" T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Stotal*3, I64_PRINTF_ARG(T), I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2602,11 +2602,11 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) // Mtotal > T/3 if (3*Mtotal < T) { log_warn(LD_DIR, - "Bw Weight Failure for %s: 3*Mtotal %lf < T " + "Bw Weight Failure for %s: 3*Mtotal %f < T " I64_FORMAT". " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Mtotal*3, I64_PRINTF_ARG(T), I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2621,10 +2621,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) casename = "Case 2b (balanced)"; if (fabs(Etotal-Mtotal) > 0.01*MAX(Etotal,Mtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Etotal %lf != Mtotal %lf. " + "Bw Weight Failure for %s: Etotal %f != Mtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Etotal, Mtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2633,10 +2633,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } if (fabs(Etotal-Gtotal) > 0.01*MAX(Etotal,Gtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Etotal %lf != Gtotal %lf. " + "Bw Weight Failure for %s: Etotal %f != Gtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Etotal, Gtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2645,10 +2645,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } if (fabs(Gtotal-Mtotal) > 0.01*MAX(Gtotal,Mtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Mtotal %lf != Gtotal %lf. " + "Bw Weight Failure for %s: Mtotal %f != Gtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Mtotal, Gtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2658,10 +2658,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } else { if (fabs(Etotal-Gtotal) > 0.01*MAX(Etotal,Gtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Etotal %lf != Gtotal %lf. " + "Bw Weight Failure for %s: Etotal %f != Gtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Etotal, Gtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2688,10 +2688,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) // Stotal < T/3 if (3*Stotal > T) { log_warn(LD_DIR, - "Bw Weight Failure for %s: 3*Stotal %lf > T " + "Bw Weight Failure for %s: 3*Stotal %f > T " I64_FORMAT". G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT " D="I64_FORMAT" T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Stotal*3, I64_PRINTF_ARG(T), I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2701,10 +2701,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) if (NS >= M) { if (fabs(NStotal-Mtotal) > 0.01*MAX(NStotal,Mtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: NStotal %lf != Mtotal %lf. " + "Bw Weight Failure for %s: NStotal %f != Mtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, NStotal, Mtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2715,10 +2715,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) // if NS < M, NStotal > T/3 because only one of G or E is scarce if (3*NStotal < T) { log_warn(LD_DIR, - "Bw Weight Failure for %s: 3*NStotal %lf < T " + "Bw Weight Failure for %s: 3*NStotal %f < T " I64_FORMAT". G="I64_FORMAT" M="I64_FORMAT " E="I64_FORMAT" D="I64_FORMAT" T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, NStotal*3, I64_PRINTF_ARG(T), I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2730,10 +2730,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) casename = "Case 3b"; if (fabs(Etotal-Mtotal) > 0.01*MAX(Etotal,Mtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Etotal %lf != Mtotal %lf. " + "Bw Weight Failure for %s: Etotal %f != Mtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Etotal, Mtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2742,10 +2742,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } if (fabs(Etotal-Gtotal) > 0.01*MAX(Etotal,Gtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Etotal %lf != Gtotal %lf. " + "Bw Weight Failure for %s: Etotal %f != Gtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Etotal, Gtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), @@ -2754,10 +2754,10 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } if (fabs(Gtotal-Mtotal) > 0.01*MAX(Gtotal,Mtotal)) { log_warn(LD_DIR, - "Bw Weight Failure for %s: Mtotal %lf != Gtotal %lf. " + "Bw Weight Failure for %s: Mtotal %f != Gtotal %f. " "G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " T="I64_FORMAT". " - "Wgg=%lf Wgd=%lf Wmg=%lf Wme=%lf Wmd=%lf Wee=%lf Wed=%lf", + "Wgg=%f Wgd=%f Wmg=%f Wme=%f Wmd=%f Wee=%f Wed=%f", casename, Mtotal, Gtotal, I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E), I64_PRINTF_ARG(D), I64_PRINTF_ARG(T), diff --git a/src/test/test.c b/src/test/test.c index 9b24a99..b5b744e 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -455,7 +455,7 @@ test_circuit_timeout(void) timeout1 = circuit_build_times_calculate_timeout(&estimate, CBT_DEFAULT_QUANTILE_CUTOFF/100.0); circuit_build_times_set_timeout(&estimate); - log_notice(LD_CIRC, "Timeout1 is %lf, Xm is %d", timeout1, estimate.Xm); + log_notice(LD_CIRC, "Timeout1 is %f, Xm is %d", timeout1, estimate.Xm); /* 2% error */ } while (fabs(circuit_build_times_cdf(&initial, timeout0) - circuit_build_times_cdf(&initial, timeout1)) > 0.02); @@ -470,7 +470,7 @@ test_circuit_timeout(void) CBT_DEFAULT_QUANTILE_CUTOFF/100.0); circuit_build_times_set_timeout(&final); - log_notice(LD_CIRC, "Timeout2 is %lf, Xm is %d", timeout2, final.Xm); + log_notice(LD_CIRC, "Timeout2 is %f, Xm is %d", timeout2, final.Xm); /* 5% here because some accuracy is lost due to histogram conversion */ test_assert(fabs(circuit_build_times_cdf(&initial, timeout0) -

1 0

r25043: {website} the verifying signatures page is now less awful it's still a (website/trunk/docs/en)
by Roger Dingledine 09 Sep '11

09 Sep '11

Author: arma Date: 2011-09-09 16:54:21 +0000 (Fri, 09 Sep 2011) New Revision: 25043 Modified: website/trunk/docs/en/verifying-signatures.wml Log: the verifying signatures page is now less awful it's still awful, in that it doesn't explain why you would want to verify a signature, or how you actually decide whether to trust a key. Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2011-09-09 00:15:11 UTC (rev 25042) +++ website/trunk/docs/en/verifying-signatures.wml 2011-09-09 16:54:21 UTC (rev 25043) @@ -12,205 +12,121 @@ <h1>How to verify signatures for packages</h1> <hr> - Each file on <a href="<page download/download>">our download page</a> is accompanied - by a file with the same name as the package and the extension - ".asc". These .asc files are GPG signatures. They allow you to verify - the file you've downloaded is exactly the one that we intended you to - get. For example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by + Each file on <a href="<page download/download>">our download + page</a> is accompanied by a file with the same name as the + package and the extension ".asc". These .asc files are GPG + signatures. They allow you to verify the file you've downloaded + is exactly the one that we intended you to get. For example, + tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by tor-browser-<version-torbrowserbundle>_en-US.exe.asc. - Of course, you'll need to have our GPG keys in your keyring: if you don't - know the GPG key, you can't be sure that it was really us who signed it. The - signing keys we use are: - <ul> - <li>Roger's (0x28988BF5) typically signs the source code file.</li> - <li>Nick's (0x165733EA, or its subkey 0x8D29319A).</li> - <li>Andrew's (0x31B0974B) typically signed older packages for windows and mac.</li> - <li>Peter's (0xC82E0039, or its subkey 0xE1DEC577).</li> - <li>Tomás's (0x9A753A6B) signs current Vidalia release tarballs and tags.</li> - <li>Matt's (0x5FA14861) signed older Vidalia release tarballs.</li> - <li>Damian's (0x9ABBEEC6) signs Arm releases</li> - <li>Jacob's (0xE012B42D).</li> - <li>Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and most linux packages.</li> - <li>Mike's (0xDDC6C0AD) signs the Torbutton xpi.</li> - <li>Karsten's (0xF7C11265) signs the metrics archives and tools.</li> - <li>Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags.</li> - <li>Nathan's (0xB374CBD2) signs the Android APK file for Orbot.</li>. - <li>Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories and archives</li> - </ul> - - <h3>Step Zero: Install GnuPG</h3> + <h3>Windows</h3> <hr> - You need to have GnuPG installed before you can verify - signatures. - <ul> - <li>Linux: see <a + You need to have GnuPG installed + before you can verify signatures. Go to <a href="http://www.gnupg.org/download/">http://www.gnupg.org/download/</a> - or install gnupg from the package management system.</li> - <li>Windows: see <a - href="http://www.gnupg.org/download/">http://www.gnupg.org/download/</a>. Look - for the "version compiled for MS-Windows" under "Binaries".</li> - <li>Mac: see <a - href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a>.</li> - </ul> + and look for the "version compiled for MS-Windows" under "Binaries". - <h3>Step One: Import the keys</h3> - <hr> - The next step is to import the key. This can be done directly from - GnuPG. Make sure you import the correct key. For example, if you - downloaded a Windows package, you will need to import Erinn's key. + Once it's installed, use GnuPG to import the key that signed your + package. Since GnuPG for Windows is a command-line tool, you will need + to use cmd.exe. Unless you edit your PATH environment variable, + you will need to tell Windows the full path to the GnuPG program. If + you installed GnuPG with the default values, the path should be + something like this: C:\Program Files\Gnu\GnuPg\gpg.exe. - Windows: - GnuPG for Windows is a command line tool, and you will need to use - cmd.exe. Unless you edit your PATH environment variable, you will - need to tell Windows the full path to the GnuPG program. If you installed GnuPG - with the default values, the path should be something like this: C:\Program - Files\Gnu\GnuPg\gpg.exe. + Erinn Clark signs the Tor Browser Bundles. Import her key + (0x63FEE659) by starting cmd.exe and typing: - To import the key 0x28988BF5, start cmd.exe and type: + <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659</pre> - <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5</pre> + After importing the key, you can verify that the fingerprint + is correct: - Mac and Linux - Whether you have a Mac or you run Linux, you will need to use the terminal - to run GnuPG. Mac users can find the terminal under "Applications". If you run - Linux and use Gnome, the terminal should be under "Applications menu" and - "Accessories". KDE users can find the terminal under "Menu" and "System". + <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --fingerprint 0x63FEE659</pre> - To import the key 0x28988BF5, start the terminal and type: + You should see: + <pre> + pub 2048R/63FEE659 2003-10-16 + Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 + uid Erinn Clark <erinn(a)torproject.org> + uid Erinn Clark <erinn(a)debian.org> + uid Erinn Clark <erinn(a)double-helix.org> + sub 2048R/EB399FD7 2003-10-16 +</pre> - <pre>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5</pre> + To verify the signature of the package you downloaded, you will need + to download the ".asc" file as well. Assuming you downloaded the + package and its signature to your Desktop, run: - <h3>Step Two: Verify the fingerprints</h3> - <hr> - After importing the key, you will want to verify that the fingerprint is correct. + <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --verify C:\Users\Alice\Desktop\<file-win32-bundle-stable>.asc C:\Users\Alice\Desktop\<file-win32-bundle-stable></pre> - Windows: - <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --fingerprint (insert keyid here)</pre> + The output should say "Good signature": - Mac and Linux - <pre>gpg --fingerprint (insert keyid here)</pre> - - The fingerprints for the keys should be: - <pre> - pub 1024D/28988BF5 2000-02-27 - Key fingerprint = B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5 - uid Roger Dingledine <arma(a)mit.edu> + gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659 + gpg: Good signature from "Erinn Clark <erinn(a)torproject.org>" + gpg: aka "Erinn Clark <erinn(a)debian.org>" + gpg: aka "Erinn Clark <erinn(a)double-helix.org>" + gpg: WARNING: This key is not certified with a trusted signature! + gpg: There is no indication that the signature belongs to the owner. + Primary key fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 + </pre> - pub 3072R/165733EA 2004-07-03 - Key fingerprint = B35B F85B F194 89D0 4E28 C33C 2119 4EBB 1657 33EA - uid Nick Mathewson <nickm(a)alum.mit.edu> - uid Nick Mathewson <nickm(a)wangafu.net> - uid Nick Mathewson <nickm(a)freehaven.net> + + Notice that there is a warning because you haven't assigned a trust + index to this person. This means that GnuPG verified that the key made + that signature, but it's up to you to decide if that key really belongs + to the developer. The best method is to meet the developer in person and + exchange key fingerprints. + - pub 1024D/31B0974B 2003-07-17 - Key fingerprint = 0295 9AA7 190A B9E9 027E 0736 3B9D 093F 31B0 974B - uid Andrew Lewman (phobos) <phobos(a)rootme.org> - uid Andrew Lewman <andrew(a)lewman.com> - uid Andrew Lewman <andrew(a)torproject.org> - sub 4096g/B77F95F7 2003-07-17 + <h3>Mac OS X</h3> + <hr> - pub 4096R/C82E0039 2003-03-24 - Key fingerprint = 25FC 1614 B8F8 7B52 FF2F 99B9 62AF 4031 C82E 0039 - uid Peter Palfrader - uid Peter Palfrader <peter(a)palfrader.org> - uid Peter Palfrader <weasel(a)debian.org> + You need to have GnuPG installed before you can verify + signatures. You can install it from <a + href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a>. + - pub 1024D/9A753A6B 2009-09-11 - Key fingerprint = 553D 7C2C 626E F16F 27F3 30BC 95E3 881D 9A75 3A6B - uid Tomás Touceda <chiiph(a)gmail.com> - sub 1024g/33BE0E5B 2009-09-11 + Once it's installed, use GnuPG to import the key that signed + your package. Erinn Clark signs the Tor Browser Bundles. Import her + key (0x63FEE659) by starting the terminal (under "Applications") + and typing: - pub 1024D/5FA14861 2005-08-17 - Key fingerprint = 9467 294A 9985 3C9C 65CB 141D AF7E 0E43 5FA1 4861 - uid Matt Edman <edmanm(a)rpi.edu> - uid Matt Edman <Matt_Edman(a)baylor.edu> - uid Matt Edman <edmanm2(a)cs.rpi.edu> - sub 4096g/EA654E59 2005-08-17 + <pre>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659</pre> - pub 1024D/9ABBEEC6 2009-06-17 - Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4 5AD9 0445 B7AB 9ABB EEC6 - uid Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> - uid Damian Johnson <atagar(a)torproject.org> - sub 2048g/146276B2 2009-06-17 - sub 2048R/87F30690 2010-08-07 + After importing the key, you can verify that the fingerprint + is correct: - pub 4096R/E012B42D 2010-05-07 - Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8 9C9E A34F A745 E012 B42D - uid Jacob Appelbaum <jacob(a)appelbaum.net> - uid Jacob Appelbaum <jacob(a)torproject.org> - sub 4096R/7CA91A52 2010-05-07 [expires: 2011-05-07] + <pre>gpg --fingerprint 0x63FEE659</pre> + You should see: + <pre> pub 2048R/63FEE659 2003-10-16 Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 uid Erinn Clark <erinn(a)torproject.org> uid Erinn Clark <erinn(a)debian.org> uid Erinn Clark <erinn(a)double-helix.org> sub 2048R/EB399FD7 2003-10-16 - - pub 1024D/F1F5C9B5 2010-02-03 - Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75 79B5 6B8A AEB1 F1F5 C9B5 - uid Erinn Clark <erinn(a)torproject.org> - sub 1024g/7828F26A 2010-02-03 - - pub 1024D/DDC6C0AD 2006-07-26 - Key fingerprint = BECD 90ED D1EE 8736 7980 ECF8 1B0C A30C DDC6 C0AD - uid Mike Perry <mikeperry(a)fscked.org> - uid Mike Perry <mikepery(a)fscked.org> - sub 4096g/AF0A91D7 2006-07-26 - - pub 1024D/F7C11265 2007-03-09 [expires: 2012-03-01] - Key fingerprint = FC8A EEF1 792E EE71 D721 7D47 D0CF 963D F7C1 1265 - uid Karsten Loesing <karsten.loesing(a)gmx.net> - sub 2048g/75D85E4B 2007-03-09 [expires: 2012-03-01] - - pub 1024D/22F6856F 2006-08-19 - Key fingerprint = DDB4 6B5B 7950 CD47 E59B 5189 4C09 25CF 22F6 856F - uid Robert Hogan <robert(a)roberthogan.net> - sub 1024g/FC4A9460 2006-08-19 - - pub 3072D/B374CBD2 2010-06-09 [expires: 2011-06-09] - Key fingerprint = B92B CA64 72F7 C6F0 8D47 8503 D2AC D203 B374 CBD2 - uid Nathan of Guardian <nathan(a)guardianproject.info> - sub 4096g/B5878C3B 2010-06-09 [expires: 2011-06-09] - - pub 2048R/886DDD89 2009-09-04 [expires: 2014-09-03] - Key fingerprint = A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89 - uid deb.torproject.org archive signing key - sub 2048R/219EC810 2009-09-04 [expires: 2012-09-03] </pre> - <h3>Step Three: Verify the downloaded package</h3> - <hr> - To verify the signature of the package you downloaded, you will need - to download the ".asc" file as well. + To verify the signature of the package you downloaded, you will need + to download the ".asc" file as well. Assuming you downloaded the + package and its signature to your Desktop, run: - In the following examples, the user Alice downloads packages for - Windows, Mac OS X and Linux and also verifies the signature of each - package. All files are saved on the desktop. - - Windows: - <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --verify C:\Users\Alice\Desktop\<file-win32-bundle-stable>.asc C:\Users\Alice\Desktop\<file-win32-bundle-stable></pre> - - Mac: <pre>gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice/<file-osx-x86-bundle-stable></pre> - Linux - <pre>gpg --verify /home/Alice/Desktop/<file-source-stable>.asc /home/Alice/Desktop/<file-source-stable></pre> - + The output should say "Good signature": - After verifying, GnuPG will come back saying something like "Good - signature" or "BAD signature". The output should look something like - this: - <pre> - gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5 - gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" + gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659 + gpg: Good signature from "Erinn Clark <erinn(a)torproject.org>" + gpg: aka "Erinn Clark <erinn(a)debian.org>" + gpg: aka "Erinn Clark <erinn(a)double-helix.org>" gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. - Primary key fingerprint: B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5 + Primary key fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 </pre> @@ -221,28 +137,20 @@ exchange key fingerprints. - For your reference, this is an example of a BAD verification. It - means that the signature and file contents do not match. In this case, - you should not trust the file contents: + <h3>Linux</h3> + <hr> - <pre> - gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5 - gpg: BAD signature from "Roger Dingledine <arma(a)mit.edu>" - </pre> + For RPM-based distributions you can manually verify the + signatures on the RPM packages by: + <pre>rpm -K filename.rpm</pre> - RPM-based distributions : - In order to manually verify the signatures on the RPM packages, you must use the - <code>rpm</code> tool like so: - - <pre>rpm -K filename.rpm</pre> - - - Debian: - If you are running Tor on Debian you should read the instructions on - <a href="<page docs/debian>#packages">importing these keys to apt</a>. + For Debian, you should read the instructions on <a + href="<page docs/debian>#packages">importing these keys to + apt</a>. If you wish to learn more about GPG, see <a href="http://www.gnupg.org/documentation/">http://www.gnupg.org/documentation/</a>. + </div>  <div id = "sidecol">

1 0

[tor/maint-0.2.2] Add changes file for bsd4 fixes
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 45ca0d2bfacc2ab54a5eb580ba8993a6919906a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 9 10:40:54 2011 -0400 Add changes file for bsd4 fixes --- changes/bug3894 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug3894 b/changes/bug3894 new file mode 100644 index 0000000..4c2220a --- /dev/null +++ b/changes/bug3894 @@ -0,0 +1,4 @@ + o Build fixes: + - Clean up some code issues that prevented Tor from building on older + BSDs. Fixes bug 3894; reported by grarpamp. +

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/enhance_replay_detection' into maint-0.2.2
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 4467799f45346a59c37de9337b24ace361cb8b6a Merge: dfa6cde cb9226b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 9 12:53:45 2011 -0400 Merge remote-tracking branch 'public/enhance_replay_detection' into maint-0.2.2 changes/replay-firstpart | 13 +++++++++++++ src/or/rendservice.c | 26 +++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/gcc-295-fix' into maint-0.2.2
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit b0695c11ebfff4ca4dc6570e49e27c03ca65e8ab Merge: 4467799 45ca0d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 9 12:54:27 2011 -0400 Merge remote-tracking branch 'public/gcc-295-fix' into maint-0.2.2 changes/bug3894 | 4 ++ configure.in | 2 +- src/common/torgzip.c | 3 +- src/common/util.c | 8 +++-- src/or/circuitbuild.c | 17 +++++----- src/or/control.c | 4 +- src/or/relay.c | 2 +- src/or/rephist.c | 4 +- src/or/routerlist.c | 10 +++--- src/or/routerparse.c | 82 ++++++++++++++++++++++++------------------------ src/test/test.c | 4 +- 11 files changed, 74 insertions(+), 66 deletions(-)

1 0

[tor/maint-0.2.2] Check for replays in PK-encrypted part of intro cell, not just in the g^x value
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit cb9226bcdb811c6b30fb4bb2b6b06b378ebf0559 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 10 21:40:10 2011 -0400 Check for replays in PK-encrypted part of intro cell, not just in the g^x value --- changes/replay-firstpart | 13 +++++++++++++ src/or/rendservice.c | 26 +++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/changes/replay-firstpart b/changes/replay-firstpart new file mode 100644 index 0000000..f4a7767 --- /dev/null +++ b/changes/replay-firstpart @@ -0,0 +1,13 @@ + o Minor features (security): + + - Check for replays of the public-key encrypted portion of an + INTRODUCE1 cell, in addition to the current check for replays of + the g^x value. This prevents a possible class of active attacks + by an attacker who controls both an introduction point and a + rendezvous point, and who uses the malleability of AES-CTR to + alter the encrypted g^x portion of the INTRODUCE1 cell. We + think that these attacks is infeasible (requiring the attacker + to send on the order of zettabytes of altered cells in a short + interval), but we'd rather block them off in case there are any + classes of this attack that we missed. Reported by dvorak. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index d1cc7f4..af6737b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -976,6 +976,29 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, "PK-encrypted portion of INTRODUCE2 cell was truncated."); return -1; } + + if (!service->accepted_intros) + service->accepted_intros = digestmap_new(); + + { + char pkpart_digest[DIGEST_LEN]; + /* Check for replay of PK-encrypted portion. It is slightly naughty to + use the same digestmap to check for this and for g^x replays, but + collisions are tremendously unlikely. + */ + crypto_digest(pkpart_digest, (char*)request+DIGEST_LEN, keylen); + access_time = digestmap_get(service->accepted_intros, pkpart_digest); + if (access_time != NULL) { + log_warn(LD_REND, "Possible replay detected! We received an " + "INTRODUCE2 cell with same PK-encrypted part %d seconds ago. " + "Dropping cell.", (int)(now-*access_time)); + return -1; + } + access_time = tor_malloc(sizeof(time_t)); + *access_time = now; + digestmap_set(service->accepted_intros, pkpart_digest, access_time); + } + /* Next N bytes is encrypted with service key */ note_crypto_pk_op(REND_SERVER); r = crypto_pk_private_hybrid_decrypt( @@ -1109,9 +1132,6 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, /* Check whether there is a past request with the same Diffie-Hellman, * part 1. */ - if (!service->accepted_intros) - service->accepted_intros = digestmap_new(); - access_time = digestmap_get(service->accepted_intros, diffie_hellman_hash); if (access_time != NULL) { log_warn(LD_REND, "Possible replay detected! We received an "

1 0

[tor/maint-0.2.2] Switch a SMARTLIST_FOREACH in circuitbuild.c to BEGIN/END
by nickm＠torproject.org 09 Sep '11

09 Sep '11

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2011