[tor-commits] [tor/master] test: fix the generate ESTABLISH_INTRO v3 cell

[nickm at torproject.org]

commit e76b072defa5f5d6f5429d4df9afdd1335591658
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Dec 16 12:18:05 2016 -0500

    test: fix the generate ESTABLISH_INTRO v3 cell
    
    The "sig_len" fields was moved below the "end_sig_fields" in the trunnel
    specification so when signing the cell content, the function generating such a
    cell needed to be adjust.
    
    Closes #20991
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/hs_service.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index 3b5a3e7..7b12b63 100644
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -152,8 +152,9 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material,
     tor_assert(encoded_len > ED25519_SIG_LEN);
 
     if (ed25519_sign_prefixed(&sig,
-                              (uint8_t*) cell_bytes_tmp,
-                              encoded_len - ED25519_SIG_LEN,
+                              cell_bytes_tmp,
+                              encoded_len -
+                                (ED25519_SIG_LEN + sizeof(cell->sig_len)),
                               ESTABLISH_INTRO_SIG_PREFIX,
                               &key_struct)) {
       log_warn(LD_BUG, "Unable to gen signature for ESTABLISH_INTRO cell.");