- tor-commits - lists.torproject.org

[obfsproxy/master] Use the official NIST four-block test vector for AES128-CTR. We are testing in-place encryption, so no need for an XXX comment.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 3ffd6ba4529fe5cfa89925f12fe4eef239b893e1 Author: Zack Weinberg <zackw(a)panix.com> Date: Mon Jul 18 12:55:21 2011 -0700 Use the official NIST four-block test vector for AES128-CTR. We are testing in-place encryption, so no need for an XXX comment. --- src/crypt.c | 3 +- src/test/unittest_crypt.c | 75 ++++++++++++++++++++++++++++++-------------- 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/crypt.c b/src/crypt.c index 8d1d607..722fc00 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -183,8 +183,7 @@ crypt_set_iv(crypt_t *key, const uchar *iv, size_t ivlen) void stream_crypt(crypt_t *key, uchar *buf, size_t len) { - AES_ctr128_encrypt(buf, buf, /* XXX make sure this is okay to do. */ - len, + AES_ctr128_encrypt(buf, buf, len, &key->key, key->ivec, key->ecount_buf, &key->pos); } diff --git a/src/test/unittest_crypt.c b/src/test/unittest_crypt.c index 14c2c41..0e48a90 100644 --- a/src/test/unittest_crypt.c +++ b/src/test/unittest_crypt.c @@ -77,27 +77,54 @@ test_crypt_hashvec(void *data) static void test_crypt_aes1(void *data) { - /* Trying AES_ctr128_encrypt(x,x,...) to see if in-place encryption works. - Seems like it's working alright. - Test vector taken from: - http://www.inconteam.com/software-development/41-encryption/55-aes-test-vec… - maybe we should find something a bit more NIST-ish */ - uchar key[16] = "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c"; - uchar iv[16] = "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"; - uchar vec[16] = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"; - - crypt_t *crypt; - - crypt = crypt_new(key, sizeof(key)); + /* In-place encryption of the test vectors from + http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf + for AES128 in counter mode (section F.5.1) */ + const uchar key[16] = + "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c"; + const uchar iv[16] = + "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"; + struct testblock { + const uchar counter[16]; + const uchar keystream[16]; + const uchar plaintext[16]; + const uchar ciphertext[16]; + }; + const struct testblock testvec[4] = { + { "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", + "\xec\x8c\xdf\x73\x98\x60\x7c\xb0\xf2\xd2\x16\x75\xea\x9e\xa1\xe4", + "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a", + "\x87\x4d\x61\x91\xb6\x20\xe3\x26\x1b\xef\x68\x64\x99\x0d\xb6\xce" }, + { "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xff\x00", + "\x36\x2b\x7c\x3c\x67\x73\x51\x63\x18\xa0\x77\xd7\xfc\x50\x73\xae", + "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51", + "\x98\x06\xf6\x6b\x79\x70\xfd\xff\x86\x17\x18\x7b\xb9\xff\xfd\xff" }, + { "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xff\x01", + "\x6a\x2c\xc3\x78\x78\x89\x37\x4f\xbe\xb4\xc8\x1b\x17\xba\x6c\x44", + "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11\xe5\xfb\xc1\x19\x1a\x0a\x52\xef", + "\x5a\xe4\xdf\x3e\xdb\xd5\xd3\x5e\x5b\x4f\x09\x02\x0d\xb0\x3e\xab", }, + { "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xff\x02", + "\xe8\x9c\x39\x9f\xf0\xf1\x98\xc6\xd4\x0a\x31\xdb\x15\x6c\xab\xfe", + "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17\xad\x2b\x41\x7b\xe6\x6c\x37\x10", + "\x1e\x03\x1d\xda\x2f\xbe\x03\xd1\x79\x21\x70\xa0\xf3\x00\x9c\xee" } + }; + + uchar vec[16]; + unsigned int i; + + crypt_t *crypt = crypt_new(key, sizeof(key)); crypt_set_iv(crypt, iv, sizeof(iv)); - stream_crypt(crypt, vec, sizeof(vec)); - tt_int_op(0, ==, memcmp(vec, - "\x87\x4d\x61\x91\xb6\x20\xe3\x26\x1b\xef\x68\x64\x99\x0d" - "\xb6\xce", 16)); + for (i = 0; i < 4; i++) { + tt_int_op(0, ==, crypt->pos); + tt_int_op(0, ==, memcmp(crypt->ivec, testvec[i].counter, 16)); - /* XXX test longer streams too; the failure modes for stream crypto are not - * visible in a single block. */ + memcpy(vec, testvec[i].plaintext, 16); + stream_crypt(crypt, vec, 16); + + tt_int_op(0, ==, memcmp(crypt->ecount_buf, testvec[i].keystream, 16)); + tt_int_op(0, ==, memcmp(vec, testvec[i].ciphertext, 16)); + } end: if (crypt) @@ -152,13 +179,13 @@ test_crypt_rng(void *data) } -#define T(name, flags) \ - { #name, test_crypt_##name, (flags), NULL, NULL } +#define T(name) \ + { #name, test_crypt_##name, 0, NULL, NULL } struct testcase_t crypt_tests[] = { - T(hashvec, 0), - T(aes1,0), - T(aes2,0), - T(rng,0), + T(hashvec), + T(aes1), + T(aes2), + T(rng), END_OF_TESTCASES };

1 0

[obfsproxy/master] Don't pass the protocol name as part of the option list provided to the protocol-specific params initialization method. Improve diagnostics in obfs2.c.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 798a292f4a4b3fd38c6ac9d3d6b238e75f35eee8 Author: Zack Weinberg <zackw(a)panix.com> Date: Thu Jul 14 12:53:00 2011 -0700 Don't pass the protocol name as part of the option list provided to the protocol-specific params initialization method. Improve diagnostics in obfs2.c. --- src/protocol.c | 4 +++- src/protocols/dummy.c | 12 +++++------- src/protocols/obfs2.c | 28 +++++++++++++--------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/protocol.c b/src/protocol.c index 85b975f..9aa1f8b 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -36,7 +36,9 @@ proto_params_init(int n_options, const char *const *options) size_t i; for (i = 0; i < n_supported_protocols; i++) if (!strcmp(*options, supported_protocols[i]->name)) - return supported_protocols[i]->init(n_options, options); + /* Remove the first element of 'options' (which is always the + protocol name) from the list passed to the init method. */ + return supported_protocols[i]->init(n_options - 1, options + 1); return NULL; } diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index 7db48d7..f121725 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -50,24 +50,22 @@ parse_and_set_options(int n_options, const char *const *options, { const char* defport; - if (n_options != 3) + if (n_options != 2) return -1; - assert(!strcmp(options[0],"dummy")); - - if (!strcmp(options[1], "client")) { + if (!strcmp(options[0], "client")) { defport = "48988"; /* bf5c */ params->mode = LSN_SIMPLE_CLIENT; - } else if (!strcmp(options[1], "socks")) { + } else if (!strcmp(options[0], "socks")) { defport = "23548"; /* 5bf5 */ params->mode = LSN_SOCKS_CLIENT; - } else if (!strcmp(options[1], "server")) { + } else if (!strcmp(options[0], "server")) { defport = "11253"; /* 2bf5 */ params->mode = LSN_SIMPLE_SERVER; } else return -1; - if (resolve_address_port(options[2], 1, 1, + if (resolve_address_port(options[1], 1, 1, &params->listen_address, &params->listen_address_len, defport) < 0) { log_warn("addr"); diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index cc208ed..41a2614 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -66,14 +66,11 @@ parse_and_set_options(int n_options, const char *const *options, int got_ss=0; const char* defport; - if ((n_options < 3) || (n_options > 5)) { - log_warn("%s(): wrong options number: %d", __func__, n_options); + if ((n_options < 2) || (n_options > 4)) { + log_warn("obfs2: wrong number of options: %d", n_options); return -1; } - assert(!strcmp(*options,"obfs2")); - options++; - /* Now parse the optional arguments */ while (!strncmp(*options,"--",2)) { if (!strncmp(*options,"--dest=",7)) { @@ -92,7 +89,7 @@ parse_and_set_options(int n_options, const char *const *options, params->shared_secret_len = strlen(*options+16); got_ss=1; } else { - log_warn("%s(): Unknown argument.", __func__); + log_warn("obfs2: Unknown argument."); return -1; } options++; @@ -108,7 +105,7 @@ parse_and_set_options(int n_options, const char *const *options, defport = "11253"; /* 2bf5 */ params->mode = LSN_SIMPLE_SERVER; } else { - log_warn("%s(): only client/socks/server modes supported.", __func__); + log_warn("obfs2: only client/socks/server modes supported."); return -1; } options++; @@ -122,16 +119,16 @@ parse_and_set_options(int n_options, const char *const *options, /* Validate option selection. */ if (got_dest && (params->mode == LSN_SOCKS_CLIENT)) { - log_warn("%s(): You can't be on socks mode and have --dest.", __func__); + log_warn("obfs2: You can't be on socks mode and have --dest."); return -1; } if (!got_dest && (params->mode != LSN_SOCKS_CLIENT)) { - log_warn("%s(): client/server mode needs --dest.", __func__); + log_warn("obfs2: client/server mode needs --dest."); return -1; } - log_debug("%s(): Parsed obfs2 options nicely!", __func__); + log_debug("obfs2: Parsed options nicely!"); params->vtable = &obfs2_vtable; return 0; @@ -371,8 +368,8 @@ obfs2_handshake(struct protocol_t *s, struct evbuffer *buf) and write those bytes onto 'dest'. Return 0 on success, -1 on failure. */ static int -crypt_and_transmit(crypt_t *crypto, - struct evbuffer *source, struct evbuffer *dest) +obfs2_crypt_and_transmit(crypt_t *crypto, + struct evbuffer *source, struct evbuffer *dest) { uchar data[1024]; while (1) { @@ -399,12 +396,13 @@ obfs2_send(struct protocol_t *s, if (state->send_crypto) { /* First of all, send any data that we've been waiting to send. */ if (state->pending_data_to_send) { - crypt_and_transmit(state->send_crypto, state->pending_data_to_send, dest); + obfs2_crypt_and_transmit(state->send_crypto, state->pending_data_to_send, + dest); evbuffer_free(state->pending_data_to_send); state->pending_data_to_send = NULL; } /* Our crypto is set up; just relay the bytes */ - return crypt_and_transmit(state->send_crypto, source, dest); + return obfs2_crypt_and_transmit(state->send_crypto, source, dest); } else { /* Our crypto isn't set up yet, we'll have to queue the data */ if (evbuffer_get_length(source)) { @@ -544,7 +542,7 @@ obfs2_recv(struct protocol_t *s, struct evbuffer *source, log_debug("%s(): Processing %d bytes data onto destination buffer", __func__, (int) evbuffer_get_length(source)); - crypt_and_transmit(state->recv_crypto, source, dest); + obfs2_crypt_and_transmit(state->recv_crypto, source, dest); if (r != RECV_SEND_PENDING) r = RECV_GOOD;

1 0

[obfsproxy/master] Factor out duplicated unittest_socks code with a test fixture. Fix some small things in unittest_crypt and unittest_obfs2 left over from previous patches.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit afa421e1b6755545f9174c02c48b0f9961530ffd Author: Zack Weinberg <zackw(a)panix.com> Date: Mon Jul 18 13:59:29 2011 -0700 Factor out duplicated unittest_socks code with a test fixture. Fix some small things in unittest_crypt and unittest_obfs2 left over from previous patches. --- src/test/unittest_crypt.c | 6 +- src/test/unittest_obfs2.c | 5 +- src/test/unittest_socks.c | 370 ++++++++++++++++++++++----------------------- 3 files changed, 184 insertions(+), 197 deletions(-) diff --git a/src/test/unittest_crypt.c b/src/test/unittest_crypt.c index 0e48a90..5a3e2aa 100644 --- a/src/test/unittest_crypt.c +++ b/src/test/unittest_crypt.c @@ -80,9 +80,9 @@ test_crypt_aes1(void *data) /* In-place encryption of the test vectors from http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf for AES128 in counter mode (section F.5.1) */ - const uchar key[16] = + static const uchar key[16] = "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c"; - const uchar iv[16] = + static const uchar iv[16] = "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"; struct testblock { const uchar counter[16]; @@ -90,7 +90,7 @@ test_crypt_aes1(void *data) const uchar plaintext[16]; const uchar ciphertext[16]; }; - const struct testblock testvec[4] = { + static const struct testblock testvec[4] = { { "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", "\xec\x8c\xdf\x73\x98\x60\x7c\xb0\xf2\xd2\x16\x75\xea\x9e\xa1\xe4", "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a", diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 961bfd2..3ac4c42 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -150,9 +150,8 @@ setup_obfs2_state(const struct testcase_t *unused) return s; end: - if (s) - cleanup_obfs2_state(NULL, s); - return 0; + cleanup_obfs2_state(NULL, s); + return NULL; } static const struct testcase_setup_t obfs2_fixture = diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index 4d95666..db4f120 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -8,12 +8,58 @@ #define SOCKS_PRIVATE #include "../socks.h" #include "../crypt.h" +#include "../util.h" #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <event2/buffer.h> +/* All the tests below use this test environment. Some of them + do not need both evbuffers, but we give them two anyway. */ +struct test_socks_state +{ + struct evbuffer *dest; + struct evbuffer *source; + socks_state_t *state; +}; + +static int +cleanup_socks_state(const struct testcase_t *unused, void *data) +{ + struct test_socks_state *s = (struct test_socks_state *)data; + + if (s->dest) + evbuffer_free(s->dest); + if (s->source) + evbuffer_free(s->source); + if (s->state) + socks_state_free(s->state); + free(data); + return 1; +} + +static void * +setup_socks_state(const struct testcase_t *unused) +{ + struct test_socks_state *s = xzalloc(sizeof(struct test_socks_state)); + + s->dest = evbuffer_new(); + tt_assert(s->dest); + s->source = evbuffer_new(); + tt_assert(s->source); + s->state = socks_state_new(); + tt_assert(s->state); + return s; + + end: + cleanup_socks_state(NULL, s); + return NULL; +} + +static const struct testcase_setup_t socks_fixture = + { setup_socks_state, cleanup_socks_state }; /** This function tests the negotiation phase of the SOCKS5 protocol. @@ -24,13 +70,7 @@ static void test_socks_socks5_send_negotiation(void *data) { - struct evbuffer *dest = NULL; - struct evbuffer *source = NULL; - dest = evbuffer_new(); - source = evbuffer_new(); - - socks_state_t *state; - state = socks_state_new(); + struct test_socks_state *s = (struct test_socks_state *)data; /* First test: Only one method: NOAUTH. @@ -39,13 +79,13 @@ test_socks_socks5_send_negotiation(void *data) req1[0] = 1; req1[1] = 0; - evbuffer_add(source, req1, 2); + evbuffer_add(s->source, req1, 2); - tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(source,dest,state)); - tt_int_op(0, ==, evbuffer_get_length(source)); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(s->source,s->dest,s->state)); + tt_int_op(0, ==, evbuffer_get_length(s->source)); uchar rep1[2]; - tt_int_op(2, ==, evbuffer_remove(dest,rep1,2)); + tt_int_op(2, ==, evbuffer_remove(s->dest,rep1,2)); tt_assert(rep1[0] == 5); tt_assert(rep1[1] == 0); @@ -56,13 +96,13 @@ test_socks_socks5_send_negotiation(void *data) memset(req2+1,0x42,8); req2[9] = 0; - evbuffer_add(source, req2, 10); + evbuffer_add(s->source, req2, 10); - tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(source,dest,state)); - tt_int_op(0, ==, evbuffer_get_length(source)); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(s->source,s->dest,s->state)); + tt_int_op(0, ==, evbuffer_get_length(s->source)); uchar rep2[2]; - tt_int_op(2, ==, evbuffer_remove(dest,rep2,2)); + tt_int_op(2, ==, evbuffer_remove(s->dest,rep2,2)); tt_assert(rep2[0] == 5); tt_assert(rep2[1] == 0); @@ -72,13 +112,13 @@ test_socks_socks5_send_negotiation(void *data) req3[0] = 99; memset(req3+1,0x42,99); - evbuffer_add(source, req3, 100); + evbuffer_add(s->source, req3, 100); - tt_int_op(SOCKS_BROKEN, ==, socks5_handle_negotiation(source,dest,state)); - tt_int_op(0, ==, evbuffer_get_length(source)); /* all data removed */ + tt_int_op(SOCKS_BROKEN, ==, socks5_handle_negotiation(s->source,s->dest,s->state)); + tt_int_op(0, ==, evbuffer_get_length(s->source)); /* all data removed */ uchar rep3[2]; - tt_int_op(2, ==, evbuffer_remove(dest,rep3,2)); + tt_int_op(2, ==, evbuffer_remove(s->dest,rep3,2)); tt_assert(rep3[0] == 5); tt_assert(rep3[1] == 0xff); @@ -91,11 +131,11 @@ test_socks_socks5_send_negotiation(void *data) req4[0] = 4; memset(req4+1,0x0,3); - evbuffer_add(source, req4, 4); + evbuffer_add(s->source, req4, 4); - tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_negotiation(source,dest,state)); - tt_int_op(4, ==, evbuffer_get_length(source)); /* no bytes removed */ - evbuffer_drain(source, 4); + tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_negotiation(s->source,s->dest,s->state)); + tt_int_op(4, ==, evbuffer_get_length(s->source)); /* no bytes removed */ + evbuffer_drain(s->source, 4); /* Fifth test: nmethods field = 3 but 4 actual methods. @@ -104,25 +144,18 @@ test_socks_socks5_send_negotiation(void *data) req5[0] = 3; memset(req5+1,0x0,4); - evbuffer_add(source, req5, 5); + evbuffer_add(s->source, req5, 5); - tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(source,dest,state)); - tt_int_op(1, ==, evbuffer_get_length(source)); /* 4 bytes removed */ - evbuffer_drain(source, 1); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(s->source,s->dest,s->state)); + tt_int_op(1, ==, evbuffer_get_length(s->source)); /* 4 bytes removed */ + evbuffer_drain(s->source, 1); uchar rep4[2]; - tt_int_op(2, ==, evbuffer_remove(dest,rep4,2)); + tt_int_op(2, ==, evbuffer_remove(s->dest,rep4,2)); tt_assert(rep4[0] == 5); tt_assert(rep4[1] == 0); - end: - if (state) - socks_state_free(state); - - if (source) - evbuffer_free(source); - if (dest) - evbuffer_free(dest); + end:; } /** @@ -135,13 +168,7 @@ test_socks_socks5_send_negotiation(void *data) static void test_socks_socks5_request(void *data) { - struct evbuffer *dest = NULL; - struct evbuffer *source = NULL; - dest = evbuffer_new(); - source = evbuffer_new(); - - socks_state_t *state; - state = socks_state_new(); + struct test_socks_state *s = (struct test_socks_state *)data; const uint32_t addr_ipv4 = htonl(0x7f000001); /* 127.0.0.1 */ const uint8_t addr_ipv6[16] = {0,13,0,1,0,5,0,14,0,10,0,5,0,14,0,0}; /* d:1:5:e:a:5:e:0 */ @@ -156,13 +183,13 @@ test_socks_socks5_request(void *data) req1[2] = 1; memcpy(req1+3,&addr_ipv4,4); - evbuffer_add(source, "\x05", 1); - evbuffer_add(source, req1, 7); - tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(source,&pr1)); /* 0: want more data*/ + evbuffer_add(s->source, "\x05", 1); + evbuffer_add(s->source, req1, 7); + tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(s->source,&pr1)); /* 0: want more data*/ /* emptying source buffer before next test */ - size_t buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + size_t buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Second test: Broken FQDN req packet with no destport */ @@ -173,13 +200,13 @@ test_socks_socks5_request(void *data) req2[3] = 15; memcpy(req1+4,&addr_ipv4,3); - evbuffer_add(source, "\x05", 1); - evbuffer_add(source, req2, 7); - tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(source,&pr1)); /* 0: want more data*/ + evbuffer_add(s->source, "\x05", 1); + evbuffer_add(s->source, req2, 7); + tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(s->source,&pr1)); /* 0: want more data*/ /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Third test: Correct IPv4 req packet. */ @@ -190,15 +217,15 @@ test_socks_socks5_request(void *data) memcpy(req3+3,&addr_ipv4,4); memcpy(req3+7,&port,2); - evbuffer_add(source, "\x05", 1); - evbuffer_add(source, req3, 9); - tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(source,&pr1)); + evbuffer_add(s->source, "\x05", 1); + evbuffer_add(s->source, req3, 9); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(s->source,&pr1)); tt_str_op(pr1.addr, ==, "127.0.0.1"); tt_int_op(pr1.port, ==, 80); /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Fourth test: Correct IPv6 req packet. */ @@ -210,14 +237,14 @@ test_socks_socks5_request(void *data) memcpy(req4+4,&addr_ipv6,16); memcpy(req4+20,&port,2); - evbuffer_add(source,req4,22); - tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(source,&pr1)); + evbuffer_add(s->source,req4,22); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(s->source,&pr1)); tt_str_op(pr1.addr, ==, "d:1:5:e:a:5:e:0"); tt_int_op(pr1.port, ==, 80); /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Fifth test: Correct FQDN req packet. */ @@ -231,8 +258,8 @@ test_socks_socks5_request(void *data) strcpy((char *)req5+5,fqdn); memcpy(req5+5+strlen(fqdn),&port,2); - evbuffer_add(source, req5, 24); - tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(source,&pr1)); + evbuffer_add(s->source, req5, 24); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(s->source,&pr1)); tt_str_op(pr1.addr, ==, "www.test.example"); tt_int_op(pr1.port, ==, 80); @@ -243,12 +270,12 @@ test_socks_socks5_request(void *data) req6[1] = 1; req6[2] = 0; - evbuffer_add(source,req6,3); - tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(source,&pr1)); + evbuffer_add(s->source,req6,3); + tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(s->source,&pr1)); /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Seventh test: Wrong Reserved field */ @@ -259,12 +286,12 @@ test_socks_socks5_request(void *data) req7[3] = 42; req7[4] = 42; - evbuffer_add(source,req7,5); - tt_int_op(SOCKS_BROKEN, ==, socks5_handle_request(source,&pr1)); + evbuffer_add(s->source,req7,5); + tt_int_op(SOCKS_BROKEN, ==, socks5_handle_request(s->source,&pr1)); /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Eigth test: Everything is dreamy... if only the requested command was CONNECT... */ @@ -275,20 +302,12 @@ test_socks_socks5_request(void *data) memcpy(req8+3,&addr_ipv4,4); memcpy(req8+7,&port,2); - evbuffer_add(source, "\x05", 1); - evbuffer_add(source, req8, 9); + evbuffer_add(s->source, "\x05", 1); + evbuffer_add(s->source, req8, 9); /* '-2' means that we don't support the requested command. */ - tt_int_op(SOCKS_CMD_NOT_CONNECT, ==, socks5_handle_request(source,&pr1)); - - - end: - if (state) - socks_state_free(state); + tt_int_op(SOCKS_CMD_NOT_CONNECT, ==, socks5_handle_request(s->source,&pr1)); - if (source) - evbuffer_free(source); - if (dest) - evbuffer_free(dest); + end:; } /** @@ -301,23 +320,19 @@ test_socks_socks5_request(void *data) static void test_socks_socks5_request_reply(void *data) { - struct evbuffer *reply_dest = NULL; - reply_dest = evbuffer_new(); + struct test_socks_state *s = (struct test_socks_state *)data; - socks_state_t *state; - state = socks_state_new(); - - state->parsereq.af = AF_INET; - strcpy(state->parsereq.addr, "127.0.0.1"); - state->parsereq.port = 7357; + s->state->parsereq.af = AF_INET; + strcpy(s->state->parsereq.addr, "127.0.0.1"); + s->state->parsereq.port = 7357; /* First test: We ask the server to send us a reply on an IPv4 request with succesful status. */ - socks5_send_reply(reply_dest,state, SOCKS5_SUCCESS); + socks5_send_reply(s->dest,s->state, SOCKS5_SUCCESS); uchar rep1[255]; - evbuffer_remove(reply_dest,rep1,255); /* yes, this is dirty */ + evbuffer_remove(s->dest,rep1,255); /* yes, this is dirty */ tt_assert(rep1[3] == SOCKS5_ATYP_IPV4); /* check address */ @@ -325,20 +340,20 @@ test_socks_socks5_request_reply(void *data) /* check port */ tt_int_op(0, ==, memcmp(rep1+4+4,"\x1c\xbd",2)); - /* emptying reply_dest buffer before next test */ - size_t buffer_len = evbuffer_get_length(reply_dest); - tt_int_op(0, ==, evbuffer_drain(reply_dest, buffer_len)); + /* emptying s->dest buffer before next test */ + size_t buffer_len = evbuffer_get_length(s->dest); + tt_int_op(0, ==, evbuffer_drain(s->dest, buffer_len)); /* Second test: We ask the server to send us a reply on an IPv6 request with succesful status. */ - state->parsereq.af = AF_INET6; - strcpy(state->parsereq.addr, "d:1:5:e:a:5:e:0"); + s->state->parsereq.af = AF_INET6; + strcpy(s->state->parsereq.addr, "d:1:5:e:a:5:e:0"); - socks5_send_reply(reply_dest,state, SOCKS5_SUCCESS); + socks5_send_reply(s->dest,s->state, SOCKS5_SUCCESS); uchar rep2[255]; - evbuffer_remove(reply_dest,rep2,255); + evbuffer_remove(s->dest,rep2,255); tt_assert(rep2[3] = SOCKS5_ATYP_IPV6); /* Test returned address against inet_pton(d:1:5:e:a:5:e:0) */ @@ -348,21 +363,21 @@ test_socks_socks5_request_reply(void *data) 16)); tt_int_op(0, ==, memcmp(rep2+4+16, "\x1c\xbd", 2)); - /* emptying reply_dest buffer before next test */ - buffer_len = evbuffer_get_length(reply_dest); - tt_int_op(0, ==, evbuffer_drain(reply_dest, buffer_len)); + /* emptying dest buffer before next test */ + buffer_len = evbuffer_get_length(s->dest); + tt_int_op(0, ==, evbuffer_drain(s->dest, buffer_len)); /* Third test : We ask the server to send us a reply on an FQDN request with failure status. */ const char *fqdn = "www.test.example"; - state->parsereq.af = AF_UNSPEC; - strcpy(state->parsereq.addr, fqdn); + s->state->parsereq.af = AF_UNSPEC; + strcpy(s->state->parsereq.addr, fqdn); - socks5_send_reply(reply_dest,state, SOCKS5_FAILED_GENERAL); + socks5_send_reply(s->dest, s->state, SOCKS5_FAILED_GENERAL); uchar rep3[255]; - evbuffer_remove(reply_dest,rep3,255); + evbuffer_remove(s->dest,rep3,255); tt_assert(rep3[3] == SOCKS5_ATYP_FQDN); tt_assert(rep3[4] == strlen(fqdn)); @@ -374,22 +389,17 @@ test_socks_socks5_request_reply(void *data) /* Fourth test: We ask the server while having an empty parsereq and with a SOCKS5_FAILED_UNSUPPORTED status. */ - memset(&state->parsereq,'\x00',sizeof(struct parsereq)); + memset(&s->state->parsereq,'\x00',sizeof(struct parsereq)); - socks5_send_reply(reply_dest,state, SOCKS5_FAILED_UNSUPPORTED); + socks5_send_reply(s->dest,s->state, SOCKS5_FAILED_UNSUPPORTED); uchar rep4[255]; - evbuffer_remove(reply_dest,rep4,255); + evbuffer_remove(s->dest,rep4,255); tt_assert(rep4[3] == SOCKS5_ATYP_IPV4); tt_int_op(0, ==, memcmp(rep4+4,"\x00\x00\x00\x00",4)); tt_int_op(0, ==, memcmp(rep4+4+4, "\x00\x00", 2)); - end: - if (state) - socks_state_free(state); - - if (reply_dest) - evbuffer_free(reply_dest); + end:; } /** @@ -402,37 +412,31 @@ test_socks_socks5_request_reply(void *data) static void test_socks_socks4_request(void *data) { - struct evbuffer *dest = NULL; - struct evbuffer *source = NULL; - dest = evbuffer_new(); - source = evbuffer_new(); + struct test_socks_state *s = (struct test_socks_state *)data; const uint32_t addr = htonl(0x7f000001); /* 127.0.0.1 */ const uint16_t port = htons(80); /* 80 */ - socks_state_t *state; - state = socks_state_new(); - /* First test: Correct SOCKS4 req packet with nothing in the optional field. */ struct parsereq pr1; memset(&pr1, 0, sizeof(struct parsereq)); - state->parsereq = pr1; + s->state->parsereq = pr1; uchar req1[8]; req1[0] = 1; memcpy(req1+1,&port,2); memcpy(req1+3,&addr,4); req1[7] = '\x00'; - evbuffer_add(source,req1,8); + evbuffer_add(s->source,req1,8); - tt_int_op(SOCKS_GOOD, ==, socks4_read_request(source,state)); - tt_str_op(state->parsereq.addr, ==, "127.0.0.1"); - tt_int_op(state->parsereq.port, ==, 80); + tt_int_op(SOCKS_GOOD, ==, socks4_read_request(s->source,s->state)); + tt_str_op(s->state->parsereq.addr, ==, "127.0.0.1"); + tt_int_op(s->state->parsereq.port, ==, 80); /* emptying source buffer before next test */ - size_t buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + size_t buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Second test: Broken SOCKS4 req packet with incomplete optional field */ @@ -442,13 +446,13 @@ test_socks_socks4_request(void *data) memcpy(req2+3,&addr,4); strcpy(req2+7,"KO"); - evbuffer_add(source,req2,9); + evbuffer_add(s->source,req2,9); - tt_int_op(SOCKS_INCOMPLETE, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_INCOMPLETE, ==, socks4_read_request(s->source,s->state)); /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Third test: Correct SOCKS4 req packet with optional field. */ @@ -458,15 +462,15 @@ test_socks_socks4_request(void *data) memcpy(req3+3,&addr,4); strcpy(req3+7,"iamalive"); - evbuffer_add(source,req3,16); + evbuffer_add(s->source,req3,16); - tt_int_op(SOCKS_GOOD, ==, socks4_read_request(source,state)); - tt_str_op(state->parsereq.addr, ==, "127.0.0.1"); - tt_int_op(state->parsereq.port, ==, 80); + tt_int_op(SOCKS_GOOD, ==, socks4_read_request(s->source,s->state)); + tt_str_op(s->state->parsereq.addr, ==, "127.0.0.1"); + tt_int_op(s->state->parsereq.port, ==, 80); /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Fourth test: Correct SOCKS4a req packet with optional field. */ @@ -478,15 +482,15 @@ test_socks_socks4_request(void *data) strcpy(req4+7,"iamalive"); strcpy(req4+16, "www.test.example"); - evbuffer_add(source,req4,33); + evbuffer_add(s->source,req4,33); - tt_int_op(SOCKS_GOOD, ==, socks4_read_request(source,state)); - tt_str_op(state->parsereq.addr, ==, "www.test.example"); - tt_int_op(state->parsereq.port, ==, 80); + tt_int_op(SOCKS_GOOD, ==, socks4_read_request(s->source,s->state)); + tt_str_op(s->state->parsereq.addr, ==, "www.test.example"); + tt_int_op(s->state->parsereq.port, ==, 80); /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Fifth test: Broken SOCKS4a req packet with incomplete optional field. */ @@ -498,13 +502,13 @@ test_socks_socks4_request(void *data) strcpy(req5+16, "www.test.example"); /* Don't send it all. */ - evbuffer_add(source,req5,28); + evbuffer_add(s->source,req5,28); - tt_int_op(SOCKS_INCOMPLETE, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_INCOMPLETE, ==, socks4_read_request(s->source,s->state)); /* emptying source buffer before next test */ - buffer_len = evbuffer_get_length(source); - tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + buffer_len = evbuffer_get_length(s->source); + tt_int_op(0, ==, evbuffer_drain(s->source, buffer_len)); /* Sixth test: Broken SOCKS4a req packet with a HUGE domain name. */ @@ -518,19 +522,12 @@ test_socks_socks4_request(void *data) memset(req6+16,'2', HUGE); req6[16+HUGE] = '\x00'; - evbuffer_add(source,req6,16+HUGE+1); + evbuffer_add(s->source,req6,16+HUGE+1); - tt_int_op(SOCKS_BROKEN, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_BROKEN, ==, socks4_read_request(s->source,s->state)); #undef HUGE - end: - if (state) - socks_state_free(state); - - if (source) - evbuffer_free(source); - if (dest) - evbuffer_free(dest); + end:; } /** @@ -543,23 +540,19 @@ test_socks_socks4_request(void *data) static void test_socks_socks4_request_reply(void *data) { - struct evbuffer *reply_dest = NULL; - reply_dest = evbuffer_new(); + struct test_socks_state *s = (struct test_socks_state *)data; - socks_state_t *state; - state = socks_state_new(); - - state->parsereq.af = AF_INET; - strcpy(state->parsereq.addr, "127.0.0.1"); - state->parsereq.port = 7357; + s->state->parsereq.af = AF_INET; + strcpy(s->state->parsereq.addr, "127.0.0.1"); + s->state->parsereq.port = 7357; /* First test: We ask the server to send us a reply on an IPv4 request with succesful status. */ - socks4_send_reply(reply_dest,state, SOCKS4_SUCCESS); + socks4_send_reply(s->dest,s->state, SOCKS4_SUCCESS); uchar rep1[255]; - evbuffer_remove(reply_dest,rep1,255); /* yes, this is dirty */ + evbuffer_remove(s->dest,rep1,255); /* yes, this is dirty */ tt_assert(rep1[0] == '\x00'); tt_assert(rep1[1] == SOCKS4_SUCCESS); @@ -568,21 +561,21 @@ test_socks_socks4_request_reply(void *data) /* check address */ tt_int_op(0, ==, memcmp(rep1+2+2,"\x7f\x00\x00\x01", 4)); - /* emptying reply_dest buffer before next test */ - size_t buffer_len = evbuffer_get_length(reply_dest); - tt_int_op(0, ==, evbuffer_drain(reply_dest, buffer_len)); + /* emptying dest buffer before next test */ + size_t buffer_len = evbuffer_get_length(s->dest); + tt_int_op(0, ==, evbuffer_drain(s->dest, buffer_len)); /* Second test : We ask the server to send us a reply on an FQDN request with failure status. */ const char *fqdn = "www.test.example"; - state->parsereq.af = AF_UNSPEC; - strcpy(state->parsereq.addr, fqdn); + s->state->parsereq.af = AF_UNSPEC; + strcpy(s->state->parsereq.addr, fqdn); - socks4_send_reply(reply_dest,state, SOCKS4_FAILED); + socks4_send_reply(s->dest,s->state, SOCKS4_FAILED); uchar rep2[255]; - evbuffer_remove(reply_dest,rep2,255); + evbuffer_remove(s->dest,rep2,255); tt_assert(rep2[1] == SOCKS4_FAILED); /* check port */ @@ -590,22 +583,17 @@ test_socks_socks4_request_reply(void *data) /* check address */ /* tt_str_op(rep1+2+2, ==, "www.test.example"); */ - end: - if (state) - socks_state_free(state); - - if (reply_dest) - evbuffer_free(reply_dest); + end:; } -#define T(name, flags) \ - { #name, test_socks_##name, (flags), NULL, NULL } +#define T(name) \ + { #name, test_socks_##name, 0, &socks_fixture, NULL } struct testcase_t socks_tests[] = { - T(socks5_send_negotiation, 0), - T(socks5_request, 0), - T(socks5_request_reply, 0), - T(socks4_request, 0), - T(socks4_request_reply, 0), + T(socks5_send_negotiation), + T(socks5_request), + T(socks5_request_reply), + T(socks4_request), + T(socks4_request_reply), END_OF_TESTCASES };

1 0

r25044: {} rescue the huge key list from the verifying-signatures page (website/trunk/docs/en)
by Roger Dingledine 09 Sep '11

09 Sep '11

Author: arma Date: 2011-09-09 17:07:51 +0000 (Fri, 09 Sep 2011) New Revision: 25044 Added: website/trunk/docs/en/signing-keys.wml Log: rescue the huge key list from the verifying-signatures page Added: website/trunk/docs/en/signing-keys.wml =================================================================== --- website/trunk/docs/en/signing-keys.wml (rev 0) +++ website/trunk/docs/en/signing-keys.wml 2011-09-09 17:07:51 UTC (rev 25044) @@ -0,0 +1,133 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 4-optional + +#include "head.wmi" TITLE="Tor Project: Signing keys" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page docs/verifying-signatures>">Verifying Signatures</a> + </div> + <div id="maincol"> + <h1>Which PGP keys sign which packages</h1> + <hr> + + <p>The signing keys we use are:</p> + <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> + + 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> + + 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> + + 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 + + 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> + + 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 + + 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 + + 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 + + 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] + + 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> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> + Property changes on: website/trunk/docs/en/signing-keys.wml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

[tor/master] Check for lround with autoconf; fall back to rint.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 0ac4b0f99d12a76f07f24d747a77f2bc07e481e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 30 22:22:15 2011 -0400 Check for lround with autoconf; fall back to rint. --- configure.in | 2 +- src/common/util.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 4e84298..df1b709 100644 --- a/configure.in +++ b/configure.in @@ -223,7 +223,7 @@ 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) +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) using_custom_malloc=no if test x$enable_openbsd_malloc = xyes ; then diff --git a/src/common/util.c b/src/common/util.c index ee0acbb..de1ca36 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -334,10 +334,12 @@ tor_mathlog(double d) long tor_lround(double d) { -#ifdef _MSC_VER - return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); -#else +#if defined(HAVE_LROUND) return lround(d); +#elif defined(HAVE_RINT) + return (long)rint(d); +#else + return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); #endif }

1 0

[tor/master] 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/master] 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/master] 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/master] 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/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