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

[tor/master] prop224: Add the introduction point onion key to descriptor
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 78e2bc4000a9014c1762f828e15e762c359aa20e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 19 13:42:35 2017 -0400 prop224: Add the introduction point onion key to descriptor A prop224 descriptor was missing the onion key for an introduction point which is needed to extend to it by the client. Closes #22979 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_descriptor.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ src/or/hs_descriptor.h | 4 ++++ src/or/parsecommon.h | 1 + 3 files changed, 54 insertions(+) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 2393eac25..91d0ef544 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -78,6 +78,7 @@ #define str_intro_auth_required "intro-auth-required" #define str_single_onion "single-onion-service" #define str_intro_point "introduction-point" +#define str_ip_onion_key "onion-key" #define str_ip_auth_key "auth-key" #define str_ip_enc_key "enc-key" #define str_ip_enc_key_cert "enc-key-cert" @@ -136,6 +137,7 @@ static token_rule_t hs_desc_encrypted_v3_token_table[] = { /* Descriptor ruleset for the introduction points section. */ static token_rule_t hs_desc_intro_point_v3_token_table[] = { T1_START(str_intro_point, R3_INTRODUCTION_POINT, EQ(1), NO_OBJ), + T1N(str_ip_onion_key, R3_INTRO_ONION_KEY, GE(2), OBJ_OK), T1(str_ip_auth_key, R3_INTRO_AUTH_KEY, NO_ARGS, NEED_OBJ), T1(str_ip_enc_key, R3_INTRO_ENC_KEY, GE(2), OBJ_OK), T1(str_ip_enc_key_cert, R3_INTRO_ENC_KEY_CERT, ARGS, OBJ_OK), @@ -479,6 +481,26 @@ encode_enc_key(const hs_desc_intro_point_t *ip) return encoded; } +/* Encode an introduction point onion key. Return a newly allocated string + * with it. On failure, return NULL. */ +static char * +encode_onion_key(const hs_desc_intro_point_t *ip) +{ + char *encoded = NULL; + char key_b64[CURVE25519_BASE64_PADDED_LEN + 1]; + + tor_assert(ip); + + /* Base64 encode the encryption key for the "onion-key" field. */ + if (curve25519_public_to_base64(key_b64, &ip->onion_key) < 0) { + goto done; + } + tor_asprintf(&encoded, "%s ntor %s", str_ip_onion_key, key_b64); + + done: + return encoded; +} + /* Encode an introduction point object and return a newly allocated string * with it. On failure, return NULL. */ static char * @@ -498,6 +520,16 @@ encode_intro_point(const ed25519_public_key_t *sig_key, tor_free(ls_str); } + /* Onion key encoding. */ + { + char *encoded_onion_key = encode_onion_key(ip); + if (encoded_onion_key == NULL) { + goto err; + } + smartlist_add_asprintf(lines, "%s", encoded_onion_key); + tor_free(encoded_onion_key); + } + /* Authentication key encoding. */ { char *encoded_cert; @@ -1662,6 +1694,23 @@ decode_introduction_point(const hs_descriptor_t *desc, const char *start) goto err; } + /* "onion-key" SP ntor SP key NL */ + tok = find_by_keyword(tokens, R3_INTRO_ONION_KEY); + if (!strcmp(tok->args[0], "ntor")) { + /* This field is using GE(2) so for possible forward compatibility, we + * accept more fields but must be at least 2. */ + tor_assert(tok->n_args >= 2); + + if (curve25519_public_from_base64(&ip->onion_key, tok->args[1]) < 0) { + log_warn(LD_REND, "Introduction point ntor onion-key is invalid"); + goto err; + } + } else { + /* Unknown key type so we can't use that introduction point. */ + log_warn(LD_REND, "Introduction point onion key is unrecognized."); + goto err; + } + /* "auth-key" NL certificate NL */ tok = find_by_keyword(tokens, R3_INTRO_AUTH_KEY); tor_assert(tok->object_body); diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 58c408979..fdf0b90b5 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -80,6 +80,10 @@ typedef struct hs_desc_intro_point_t { * contains hs_desc_link_specifier_t object. It MUST have at least one. */ smartlist_t *link_specifiers; + /* Onion key of the introduction point used to extend to it for the ntor + * handshake. */ + curve25519_public_key_t onion_key; + /* Authentication key used to establish the introduction point circuit and * cross-certifies the blinded public key for the replica thus signed by * the blinded key and in turn signs it. */ diff --git a/src/or/parsecommon.h b/src/or/parsecommon.h index b9f161345..a76b104fd 100644 --- a/src/or/parsecommon.h +++ b/src/or/parsecommon.h @@ -160,6 +160,7 @@ typedef enum { R3_INTRO_AUTH_REQUIRED, R3_SINGLE_ONION_SERVICE, R3_INTRODUCTION_POINT, + R3_INTRO_ONION_KEY, R3_INTRO_AUTH_KEY, R3_INTRO_ENC_KEY, R3_INTRO_ENC_KEY_CERT,

1 0

[tor/master] prop224: Update hs identifier circuit
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 2b9575a9c0ecf6e3880654be16d103326788cecf Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jul 24 13:45:01 2017 -0400 prop224: Update hs identifier circuit Remove the legacy intro point key because both service and client only uses the ed25519 key even though the intro point chosen is a legacy one. This also adds the CLIENT_PK key that is needed for the ntor handshake. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_ident.c | 3 --- src/or/hs_ident.h | 21 ++++++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/or/hs_ident.c b/src/or/hs_ident.c index 5b5dc9aaf..c3f789db5 100644 --- a/src/or/hs_ident.c +++ b/src/or/hs_ident.c @@ -30,9 +30,6 @@ hs_ident_circuit_free(hs_ident_circuit_t *ident) if (ident == NULL) { return; } - if (ident->auth_key_type == HS_AUTH_KEY_TYPE_LEGACY) { - crypto_pk_free(ident->auth_rsa_pk); - } memwipe(ident, 0, sizeof(hs_ident_circuit_t)); tor_free(ident); } diff --git a/src/or/hs_ident.h b/src/or/hs_ident.h index 8a7c3598c..ca1fa3d70 100644 --- a/src/or/hs_ident.h +++ b/src/or/hs_ident.h @@ -52,27 +52,30 @@ typedef struct hs_ident_circuit_t { * set when an object is initialized in its constructor. */ hs_ident_circuit_type_t circuit_type; - /* (Only intro point circuit) Which type of authentication key this - * circuit identifier is using. */ - hs_auth_key_type_t auth_key_type; + /* (All circuit) Introduction point authentication key. It's also needed on + * the rendezvous circuit for the ntor handshake. */ + ed25519_public_key_t intro_auth_pk; - /* (Only intro point circuit) Introduction point authentication key. In - * legacy mode, we use an RSA key else an ed25519 public key. */ - crypto_pk_t *auth_rsa_pk; - ed25519_public_key_t auth_ed25519_pk; + /* (Only client rendezvous circuit) Introduction point encryption public + * key. We keep it in the rendezvous identifier for the ntor handshake. */ + curve25519_public_key_t intro_enc_pk; /* (Only rendezvous circuit) Rendezvous cookie sent from the client to the * service with an INTRODUCE1 cell and used by the service in an * RENDEZVOUS1 cell. */ uint8_t rendezvous_cookie[HS_REND_COOKIE_LEN]; - /* (Only rendezvous circuit) The HANDSHAKE_INFO needed in the RENDEZVOUS1 - * cell of the service. The construction is as follows: + /* (Only service rendezvous circuit) The HANDSHAKE_INFO needed in the + * RENDEZVOUS1 cell of the service. The construction is as follows: * SERVER_PK [32 bytes] * AUTH_MAC [32 bytes] */ uint8_t rendezvous_handshake_info[CURVE25519_PUBKEY_LEN + DIGEST256_LEN]; + /* (Only client rendezvous circuit) Client ephemeral keypair needed for the + * e2e encryption with the service. */ + curve25519_keypair_t rendezvous_client_kp; + /* (Only rendezvous circuit) The NTOR_KEY_SEED needed for key derivation for * the e2e encryption with the client on the circuit. */ uint8_t rendezvous_ntor_key_seed[DIGEST256_LEN];

1 0

[tor/master] hs: Implement constructor for hs_desc_intro_point_t
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 44e3255c4df78828110cec360031a616c6d8d0fa Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 20 11:34:32 2017 -0400 hs: Implement constructor for hs_desc_intro_point_t Add a new and free function for hs_desc_intro_point_t so the service can use them to setup those objects properly. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_descriptor.c | 59 ++++++++++++++++++++++++------------------- src/or/hs_descriptor.h | 4 ++- src/test/hs_test_helpers.c | 3 +-- src/test/test_hs_descriptor.c | 6 ++--- 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 91d0ef544..7908cd961 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -146,29 +146,6 @@ static token_rule_t hs_desc_intro_point_v3_token_table[] = { END_OF_TABLE }; -/* Free a descriptor intro point object. */ -STATIC void -desc_intro_point_free(hs_desc_intro_point_t *ip) -{ - if (!ip) { - return; - } - if (ip->link_specifiers) { - SMARTLIST_FOREACH(ip->link_specifiers, hs_desc_link_specifier_t *, - ls, tor_free(ls)); - smartlist_free(ip->link_specifiers); - } - tor_cert_free(ip->auth_key_cert); - tor_cert_free(ip->enc_key_cert); - if (ip->legacy.key) { - crypto_pk_free(ip->legacy.key); - } - if (ip->legacy.cert.encoded) { - tor_free(ip->legacy.cert.encoded); - } - tor_free(ip); -} - /* Free the content of the plaintext section of a descriptor. */ static void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc) @@ -199,7 +176,7 @@ desc_encrypted_data_free_contents(hs_desc_encrypted_data_t *desc) } if (desc->intro_points) { SMARTLIST_FOREACH(desc->intro_points, hs_desc_intro_point_t *, ip, - desc_intro_point_free(ip)); + hs_desc_intro_point_free(ip)); smartlist_free(desc->intro_points); } memwipe(desc, 0, sizeof(*desc)); @@ -1683,11 +1660,13 @@ decode_introduction_point(const hs_descriptor_t *desc, const char *start) /* Ok we seem to have a well formed section containing enough tokens to * parse. Allocate our IP object and try to populate it. */ - ip = tor_malloc_zero(sizeof(hs_desc_intro_point_t)); + ip = hs_desc_intro_point_new(); /* "introduction-point" SP link-specifiers NL */ tok = find_by_keyword(tokens, R3_INTRODUCTION_POINT); tor_assert(tok->n_args == 1); + /* Our constructor creates this list by default so free it. */ + smartlist_free(ip->link_specifiers); ip->link_specifiers = decode_link_specifiers(tok->args[0]); if (!ip->link_specifiers) { log_warn(LD_REND, "Introduction point has invalid link specifiers"); @@ -1782,7 +1761,7 @@ decode_introduction_point(const hs_descriptor_t *desc, const char *start) goto done; err: - desc_intro_point_free(ip); + hs_desc_intro_point_free(ip); ip = NULL; done: @@ -2401,3 +2380,31 @@ hs_desc_plaintext_obj_size(const hs_desc_plaintext_data_t *data) data->superencrypted_blob_size); } +/* Return a newly allocated descriptor intro point. */ +hs_desc_intro_point_t * +hs_desc_intro_point_new(void) +{ + hs_desc_intro_point_t *ip = tor_malloc_zero(sizeof(*ip)); + ip->link_specifiers = smartlist_new(); + return ip; +} + +/* Free a descriptor intro point object. */ +void +hs_desc_intro_point_free(hs_desc_intro_point_t *ip) +{ + if (ip == NULL) { + return; + } + if (ip->link_specifiers) { + SMARTLIST_FOREACH(ip->link_specifiers, hs_desc_link_specifier_t *, + ls, tor_free(ls)); + smartlist_free(ip->link_specifiers); + } + tor_cert_free(ip->auth_key_cert); + tor_cert_free(ip->enc_key_cert); + crypto_pk_free(ip->legacy.key); + tor_free(ip->legacy.cert.encoded); + tor_free(ip); +} + diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index fdf0b90b5..80ddf8978 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -215,6 +215,9 @@ int hs_desc_decode_encrypted(const hs_descriptor_t *desc, size_t hs_desc_plaintext_obj_size(const hs_desc_plaintext_data_t *data); +hs_desc_intro_point_t *hs_desc_intro_point_new(void); +void hs_desc_intro_point_free(hs_desc_intro_point_t *ip); + #ifdef HS_DESCRIPTOR_PRIVATE /* Encoding. */ @@ -233,7 +236,6 @@ STATIC int cert_is_valid(tor_cert_t *cert, uint8_t type, STATIC int desc_sig_is_valid(const char *b64_sig, const ed25519_public_key_t *signing_pubkey, const char *encoded_desc, size_t encoded_len); -STATIC void desc_intro_point_free(hs_desc_intro_point_t *ip); STATIC size_t decode_superencrypted(const char *message, size_t message_len, uint8_t **encrypted_out); #endif /* HS_DESCRIPTOR_PRIVATE */ diff --git a/src/test/hs_test_helpers.c b/src/test/hs_test_helpers.c index 3f0d6a941..24d4a7e91 100644 --- a/src/test/hs_test_helpers.c +++ b/src/test/hs_test_helpers.c @@ -15,8 +15,7 @@ hs_helper_build_intro_point(const ed25519_keypair_t *signing_kp, time_t now, int ret; ed25519_keypair_t auth_kp; hs_desc_intro_point_t *intro_point = NULL; - hs_desc_intro_point_t *ip = tor_malloc_zero(sizeof(*ip)); - ip->link_specifiers = smartlist_new(); + hs_desc_intro_point_t *ip = hs_desc_intro_point_new(); { hs_desc_link_specifier_t *ls = tor_malloc_zero(sizeof(*ls)); diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index b1abe381d..d83f5e4c6 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -427,7 +427,7 @@ test_decode_invalid_intro_point(void *arg) const char *junk = "this is not a descriptor"; ip = decode_introduction_point(desc, junk); tt_assert(!ip); - desc_intro_point_free(ip); + hs_desc_intro_point_free(ip); ip = NULL; } @@ -445,7 +445,7 @@ test_decode_invalid_intro_point(void *arg) tt_assert(!ip); tor_free(encoded_ip); smartlist_free(lines); - desc_intro_point_free(ip); + hs_desc_intro_point_free(ip); ip = NULL; } @@ -545,7 +545,7 @@ test_decode_invalid_intro_point(void *arg) done: hs_descriptor_free(desc); - desc_intro_point_free(ip); + hs_desc_intro_point_free(ip); } static void

1 0

[tor/master] Remove a needless memwipe.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 649104fdb950057288a5e7b48f402d563546b83b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 19:58:19 2017 -0400 Remove a needless memwipe. The interior of ctx here is already wiped by crypto_digest_free(). This memwipe call only wiped the pointer itself, which isn't sensitive. --- src/common/crypto_ed25519.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index d61549b79..abf23c4b3 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -468,7 +468,6 @@ ed25519_keypair_from_curve25519_keypair(ed25519_keypair_t *out, tor_assert(fast_memeq(pubkey_check.pubkey, out->pubkey.pubkey, 32)); memwipe(&pubkey_check, 0, sizeof(pubkey_check)); - memwipe(&ctx, 0, sizeof(ctx)); memwipe(sha512_output, 0, sizeof(sha512_output)); return 0;

1 0

[tor/master] Fix a memory leak in consdiffmgr.c
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 3af4aafbcb035271f84480ef745bad2b8c28a92b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 09:12:09 2017 -0400 Fix a memory leak in consdiffmgr.c Fixes bug 23139; bugfix on 0.3.1.1-alpha. --- changes/bug23139 | 3 +++ src/or/consdiffmgr.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug23139 b/changes/bug23139 new file mode 100644 index 000000000..ed63ce85e --- /dev/null +++ b/changes/bug23139 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory cache): + - Fix a memory leak in the code that recovers space in the consensus + directory cache. Fixes bug 23139; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 67a5d0b3c..928fc26f5 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1156,6 +1156,7 @@ consdiffmgr_ensure_space_for_files(int n) if (++n_marked >= n_to_remove) break; } SMARTLIST_FOREACH_END(ent); + smartlist_free(objects); consensus_cache_delete_pending(cache, 1); if (BUG(n_marked < n_to_remove))

1 0

[tor/maint-0.3.1] Merge branch 'bug23139' into maint-0.3.1
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit a47b8fcf9295111339b80e5bc81c3de428241cad Merge: 5368eaf62 3af4aafbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 19:29:05 2017 -0400 Merge branch 'bug23139' into maint-0.3.1 changes/bug23139 | 3 +++ src/or/consdiffmgr.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/maint-0.3.1] Fix a memory leak in consdiffmgr.c
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 3af4aafbcb035271f84480ef745bad2b8c28a92b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 09:12:09 2017 -0400 Fix a memory leak in consdiffmgr.c Fixes bug 23139; bugfix on 0.3.1.1-alpha. --- changes/bug23139 | 3 +++ src/or/consdiffmgr.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug23139 b/changes/bug23139 new file mode 100644 index 000000000..ed63ce85e --- /dev/null +++ b/changes/bug23139 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory cache): + - Fix a memory leak in the code that recovers space in the consensus + directory cache. Fixes bug 23139; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 67a5d0b3c..928fc26f5 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1156,6 +1156,7 @@ consdiffmgr_ensure_space_for_files(int n) if (++n_marked >= n_to_remove) break; } SMARTLIST_FOREACH_END(ent); + smartlist_free(objects); consensus_cache_delete_pending(cache, 1); if (BUG(n_marked < n_to_remove))

1 0

[tor/release-0.3.1] Fix a memory leak in consdiffmgr.c
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 3af4aafbcb035271f84480ef745bad2b8c28a92b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 09:12:09 2017 -0400 Fix a memory leak in consdiffmgr.c Fixes bug 23139; bugfix on 0.3.1.1-alpha. --- changes/bug23139 | 3 +++ src/or/consdiffmgr.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug23139 b/changes/bug23139 new file mode 100644 index 000000000..ed63ce85e --- /dev/null +++ b/changes/bug23139 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory cache): + - Fix a memory leak in the code that recovers space in the consensus + directory cache. Fixes bug 23139; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 67a5d0b3c..928fc26f5 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1156,6 +1156,7 @@ consdiffmgr_ensure_space_for_files(int n) if (++n_marked >= n_to_remove) break; } SMARTLIST_FOREACH_END(ent); + smartlist_free(objects); consensus_cache_delete_pending(cache, 1); if (BUG(n_marked < n_to_remove))

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit b08a2dc95470d448b25e52b702701b432d056d17 Merge: 48a57f981 a47b8fcf9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 19:29:10 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23139 | 3 +++ src/or/consdiffmgr.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/master] Merge branch 'bug23139' into maint-0.3.1
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit a47b8fcf9295111339b80e5bc81c3de428241cad Merge: 5368eaf62 3af4aafbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 19:29:05 2017 -0400 Merge branch 'bug23139' into maint-0.3.1 changes/bug23139 | 3 +++ src/or/consdiffmgr.c | 1 + 2 files changed, 4 insertions(+)

1 0