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

[tor/master] Fix crypto/digests test
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit e7165659e02b84ee48e141c84fef510670132cbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 13:33:29 2013 -0500 Fix crypto/digests test --- src/test/test_crypto.c | 14 +++++++------- src/test/test_data.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 9dc43b1..6c4820f 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -13,9 +13,9 @@ #include "crypto_curve25519.h" #endif -extern const char AUTHORITY_SIGNKEY_1[]; -extern const char AUTHORITY_SIGNKEY_1_DIGEST[]; -extern const char AUTHORITY_SIGNKEY_1_DIGEST256[]; +extern const char AUTHORITY_SIGNKEY_3[]; +extern const char AUTHORITY_SIGNKEY_A_DIGEST[]; +extern const char AUTHORITY_SIGNKEY_A_DIGEST256[]; /** Run unit tests for Diffie-Hellman functionality. */ static void @@ -519,20 +519,20 @@ test_crypto_digests(void) k = crypto_pk_new(); test_assert(k); - r = crypto_pk_read_private_key_from_string(k, AUTHORITY_SIGNKEY_1, -1); + r = crypto_pk_read_private_key_from_string(k, AUTHORITY_SIGNKEY_3, -1); test_assert(!r); r = crypto_pk_get_digest(k, digest); test_assert(r == 0); test_memeq(hex_str(digest, DIGEST_LEN), - AUTHORITY_SIGNKEY_1_DIGEST, HEX_DIGEST_LEN); + AUTHORITY_SIGNKEY_A_DIGEST, HEX_DIGEST_LEN); r = crypto_pk_get_all_digests(k, &pkey_digests); test_memeq(hex_str(pkey_digests.d[DIGEST_SHA1], DIGEST_LEN), - AUTHORITY_SIGNKEY_1_DIGEST, HEX_DIGEST_LEN); + AUTHORITY_SIGNKEY_A_DIGEST, HEX_DIGEST_LEN); test_memeq(hex_str(pkey_digests.d[DIGEST_SHA256], DIGEST256_LEN), - AUTHORITY_SIGNKEY_1_DIGEST256, HEX_DIGEST256_LEN); + AUTHORITY_SIGNKEY_A_DIGEST256, HEX_DIGEST256_LEN); done: crypto_pk_free(k); } diff --git a/src/test/test_data.c b/src/test/test_data.c index 9aef106..e1f6f6c 100644 --- a/src/test/test_data.c +++ b/src/test/test_data.c @@ -73,9 +73,9 @@ const char AUTHORITY_SIGNKEY_A[] = "Yx4lqK0ca5IkTp3HevwnlWaJgbaOTUspCVshzJBhDA==\n" "-----END RSA PRIVATE KEY-----\n"; -const char AUTHORITY_SIGNKEY_1_DIGEST[] = +const char AUTHORITY_SIGNKEY_A_DIGEST[] = "CBF56A83368A5150F1A9AAADAFB4D77F8C4170E2"; -const char AUTHORITY_SIGNKEY_1_DIGEST256[] = +const char AUTHORITY_SIGNKEY_A_DIGEST256[] = "AF7C5468DBE3BA54A052726038D7F15F3C4CA511B1952645B3D96D83A8DFB51C"; /** Second of 3 example authority certificates for unit testing. */

1 0

[torspec/master] reindex proposals
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit f4b8bdd73e18ea7a70145c084abcac0e59b1df60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 13:28:01 2013 -0500 reindex proposals --- proposals/000-index.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index fcdbb55..75ea52b 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -77,7 +77,7 @@ Proposals by number: 154 Automatic Software Update Protocol [SUPERSEDED] 155 Four Improvements of Hidden Service Performance [FINISHED] 156 Tracking blocked ports on the client side [OPEN] -157 Make certificate downloads specific [ACCEPTED] +157 Make certificate downloads specific [CLOSED] 158 Clients download consensus + microdescriptors [FINISHED] 159 Exit Scanning [OPEN] 160 Authorities vote for bandwidth offsets in consensus [FINISHED] @@ -191,7 +191,6 @@ Proposals by status: ACCEPTED: 140 Provide diffs between consensuses 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.4.x] - 157 Make certificate downloads specific [for 0.2.4.x] 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion META: @@ -238,6 +237,7 @@ Proposals by status: 148 Stream end reasons from the client side should be uniform [in 0.2.1.9-alpha] 150 Exclude Exit Nodes from a circuit [in 0.2.1.3-alpha] 152 Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha] + 157 Make certificate downloads specific [for 0.2.4.x] 166 Including Network Statistics in Extra-Info Documents [for 0.2.2] 167 Vote on network parameters in consensus [in 0.2.2] 171 Separate streams across circuits by connection metadata [in 0.2.3.3-alpha]

1 0

[torspec/master] Mark the dir-key-crosscert element as required.
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit 047f6dd916b906b6f5b7c1278c9fbc056e7fbf82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 14 09:39:29 2013 -0500 Mark the dir-key-crosscert element as required. This closes proposal 157. --- dir-spec.txt | 9 ++------- proposals/157-specific-cert-download.txt | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index d1d1994..39d880e 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1076,11 +1076,7 @@ "dir-key-crosscert" NL CrossSignature NL - [At most once.] - - NOTE: Authorities MUST include this field in all newly generated - certificates. A future version of this specification will make - the field required. + [Exactly once.] CrossSignature is a signature, made using the certificate's signing key, of the digest of the PKCS1-padded hash of the certificate's @@ -1089,8 +1085,7 @@ SIGNATURE---- and -----END ID SIGNATURE----- tags. Implementations MUST allow the "ID " portion to be omitted, however. - When encountering a certificate with a dir-key-crosscert entry, - implementations MUST verify that the signature is a correct signature + Implementations MUST verify that the signature is a correct signature of the hash of the identity key using the signing key. "dir-key-certification" NL Signature NL diff --git a/proposals/157-specific-cert-download.txt b/proposals/157-specific-cert-download.txt index cf29dd9..e0ef0e8 100644 --- a/proposals/157-specific-cert-download.txt +++ b/proposals/157-specific-cert-download.txt @@ -2,7 +2,7 @@ Filename: 157-specific-cert-download.txt Title: Make certificate downloads specific Author: Nick Mathewson Created: 2-Dec-2008 -Status: Accepted +Status: Closed Target: 0.2.4.x History:

1 0

[torspec/master] Merge remote-tracking branch 'public/finish_prop157'
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit edfba62f3bdfd9659a38e899e11dedd604d0718d Merge: 74c3e40 047f6dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 13:27:48 2013 -0500 Merge remote-tracking branch 'public/finish_prop157' dir-spec.txt | 9 ++------- proposals/157-specific-cert-download.txt | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-)

1 0

[tor/master] Add a _GNU_SOURCE definition to backtrace.c to fix compilation
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit 3cdd7966d72a7e8b2e63938cbbb62030556b93fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 13:05:23 2013 -0500 Add a _GNU_SOURCE definition to backtrace.c to fix compilation --- src/common/backtrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index f0f499a..5049298 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -1,14 +1,15 @@ /* Copyright (c) 2013, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +#define __USE_GNU +#define _GNU_SOURCE 1 + #include "orconfig.h" #include "backtrace.h" #include "compat.h" #include "util.h" #include "torlog.h" -#define __USE_GNU - #ifdef HAVE_EXECINFO_H #include <execinfo.h> #endif

1 0

[tor/master] Whoops; changes files belong in changes.
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit d0f9a2b846c1602de035d105d2440f98a7c518af Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 12:49:12 2013 -0500 Whoops; changes files belong in changes. --- changes/ticket9839 | 3 +++ ticket9839 | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/ticket9839 b/changes/ticket9839 new file mode 100644 index 0000000..a71c231 --- /dev/null +++ b/changes/ticket9839 @@ -0,0 +1,3 @@ + o Documentation: + - Update manpage to describe some of the files one could find + in data directory. Fixes bug 9839. diff --git a/ticket9839 b/ticket9839 deleted file mode 100644 index a71c231..0000000 --- a/ticket9839 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Update manpage to describe some of the files one could find - in data directory. Fixes bug 9839.

1 0

[tor/master] Whoops -- add missing defined().
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit 90254234710595c0db0c01722eba84e2144d28f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 11:36:23 2013 -0500 Whoops -- add missing defined(). --- src/common/backtrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 32e5362..f0f499a 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -24,7 +24,7 @@ #ifdef HAVE_CYGWIN_SIGNAL_H #include <cygwin/signal.h> -#elif HAVE_SYS_UCONTEXT_H +#elif defined(HAVE_SYS_UCONTEXT_H) #include <sys/ucontext.h> #elif defined(HAVE_UCONTEXT_H) #include <ucontext.h>

1 0

[tor/master] Make header includes match declarations in pc_from_ucontext.m4
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit 93c99508d2440f4ff11df62315cf54f2acd932f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 11:34:15 2013 -0500 Make header includes match declarations in pc_from_ucontext.m4 With any luck, this will clean up errors where we detect that REG_{EIP,RIP} is present in autoconf, but when we go to include it, it isn't there. --- src/common/backtrace.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 78bc66e..32e5362 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -21,11 +21,13 @@ #ifdef HAVE_SIGNAL_H #include <signal.h> #endif -#ifdef HAVE_UCONTEXT_H -#include <ucontext.h> -#endif -#ifdef HAVE_SYS_UCONTEXT_H + +#ifdef HAVE_CYGWIN_SIGNAL_H +#include <cygwin/signal.h> +#elif HAVE_SYS_UCONTEXT_H #include <sys/ucontext.h> +#elif defined(HAVE_UCONTEXT_H) +#include <ucontext.h> #endif #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \

1 0

[tor/master] Fix compilation under openssl 0.9.8
by nickm＠torproject.org 18 Nov '13

18 Nov '13

commit adf2fa9b4954c584ee381cb94d9c0c81d2c22fec Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 18 11:23:54 2013 -0500 Fix compilation under openssl 0.9.8 It's not nice to talk about NID_aes_{128,256}_{ctr,gcm} when they don't exist. Fix on 84458b79a78ea7e26820bf0; bug not in any released Tor. --- src/common/crypto.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/common/crypto.c b/src/common/crypto.c index cbe992e..5afb98e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -318,10 +318,16 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) log_engine("3DES-CBC", ENGINE_get_cipher_engine(NID_des_ede3_cbc)); log_engine("AES-128-ECB", ENGINE_get_cipher_engine(NID_aes_128_ecb)); log_engine("AES-128-CBC", ENGINE_get_cipher_engine(NID_aes_128_cbc)); +#ifdef NID_aes_128_ctr log_engine("AES-128-CTR", ENGINE_get_cipher_engine(NID_aes_128_ctr)); +#endif +#ifdef NID_aes_128_gcm log_engine("AES-128-GCM", ENGINE_get_cipher_engine(NID_aes_128_gcm)); +#endif log_engine("AES-256-CBC", ENGINE_get_cipher_engine(NID_aes_256_cbc)); +#ifdef NID_aes_256_gcm log_engine("AES-256-GCM", ENGINE_get_cipher_engine(NID_aes_256_gcm)); +#endif #endif } else {

1 0

[metrics-web/master] Display graph titles in new user graphs.
by karsten＠torproject.org 18 Nov '13

18 Nov '13

commit c9c5c7313ef39f0f4b5bb685fc34f7698f186c2f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 18 17:23:31 2013 +0100 Display graph titles in new user graphs. Fixes #10142. --- rserve/graphs.R | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 8a62bf4..86eda59 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -1034,28 +1034,28 @@ plot_userstats <- function(start, end, node, variable, value, events, if (value != 'all') { u <- u[u$country == value & u$node == 'relay', ] title <- paste("Directly connecting users from ", - countryname(value), " (BETA)\n", sep = "") + countryname(value), "\n", sep = "") } else { u <- u[u$country == '' & u$transport == '' & u$version == '' & u$node == 'relay', ] - title <- "Directly connecting users (BETA)\n" + title <- "Directly connecting users\n" } } else if (variable == 'transport') { u <- u[u$transport == value & u$node == 'bridge', ] - title <- paste("Bridge users using transport ", value, " (BETA)\n", + title <- paste("Bridge users using transport ", value, "\n", sep = "") } else if (variable == 'version') { u <- u[u$version== value & u$node == 'bridge', ] - title <- paste("Bridge users using IP", value, " (BETA)\n", sep = "") + title <- paste("Bridge users using IP", value, "\n", sep = "") } else { if (value != 'all') { u <- u[u$country == value & u$node == 'bridge', ] title <- paste("Bridge users from ", countryname(value), - " (BETA)\n", sep = "") + "\n", sep = "") } else { u <- u[u$country == '' & u$transport == '' & u$version == '' & u$node == 'bridge', ] - title <- "Bridge users (BETA)\n" + title <- "Bridge users\n" } } u <- data.frame(date = as.Date(u$date, "%Y-%m-%d"), users = u$users) @@ -1107,7 +1107,7 @@ plot_userstats <- function(start, end, node, variable, value, events, format = date_breaks$format, major = date_breaks$major, minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max_y), - formatter = formatter) + formatter = formatter) + opts(title = title) ggsave(filename = path, width = 8, height = 5, dpi = 72) }

1 0