[tor-commits] [tor/master] Add note about handling INTRODUCE2 cells.

[nickm at torproject.org]

commit 0a0bbfe96fe425f27641f86fabd19f65a551ac6c
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 8 11:51:16 2017 +0300

    Add note about handling INTRODUCE2 cells.
    
    Also fix a check-spaces instance.
---
 src/or/hs_cell.c           | 5 +++++
 src/test/test_hs_service.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c
index 064e26334..a0e907460 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 6a7b9b527..aea2c8fbf 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);