diff options
| author | George Kadianakis <desnacked@riseup.net> | 2017-08-08 11:51:16 +0300 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-08 20:29:35 -0400 |
| commit | 0a0bbfe96fe425f27641f86fabd19f65a551ac6c (patch) | |
| tree | a6962126db56d185811f7fbe213fc14eac0a9e81 | |
| parent | ff249ee4a6ea665bb7ed1c7ab53d4d6b0eb9db78 (diff) | |
| download | tor-0a0bbfe96fe425f27641f86fabd19f65a551ac6c.tar.gz tor-0a0bbfe96fe425f27641f86fabd19f65a551ac6c.zip | |
Add note about handling INTRODUCE2 cells.
Also fix a check-spaces instance.
| -rw-r--r-- | src/or/hs_cell.c | 5 | ||||
| -rw-r--r-- | src/test/test_hs_service.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index 064e26334d..a0e9074601 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -210,6 +210,11 @@ build_legacy_establish_intro(const char *circ_nonce, crypto_pk_t *enc_key, * service and circuit which are used only for logging purposes. The resulting * parsed cell is put in cell_ptr_out. * + * This function only parses prop224 INTRODUCE2 cells even when the intro point + * is a legacy intro point. That's because intro points don't actually care + * about the contents of the introduce cell. Legacy INTRODUCE cells are only + * used by the legacy system now. + * * Return 0 on success else a negative value and cell_ptr_out is untouched. */ static int parse_introduce2_cell(const hs_service_t *service, diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 6a7b9b5272..aea2c8fbfb 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1114,7 +1114,8 @@ test_build_update_descriptors(void *arg) ed25519_keypair_generate(&kp1, 0); ri.cache_info.signing_key_cert = tor_malloc_zero(sizeof(tor_cert_t)); tt_assert(ri.cache_info.signing_key_cert); - ed25519_pubkey_copy(&ri.cache_info.signing_key_cert->signing_key, &kp1.pubkey); + ed25519_pubkey_copy(&ri.cache_info.signing_key_cert->signing_key, + &kp1.pubkey); nodelist_set_routerinfo(&ri, NULL); node = node_get_mutable_by_id(ri.cache_info.identity_digest); tt_assert(node); |