commit 88e4ffab9ea98d135de592c3af368940ee4f0c5f Merge: e167a0e d6c1491 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 18 17:13:36 2017 -0500

Merge remote-tracking branch 'dgoulet/ticket20029_030_06-resquash'

src/or/hs_intropoint.c | 340 +++++++++++++++++++++++++++++++++++++++--- src/or/hs_intropoint.h | 25 +++- src/or/relay.c | 10 +- src/or/relay.h | 7 +- src/or/rendcommon.c | 2 +- src/or/rendmid.c | 30 +--- src/or/rendmid.h | 4 +- src/test/test_hs_intropoint.c | 332 ++++++++++++++++++++++++++++++++++++++++- 8 files changed, 693 insertions(+), 57 deletions(-)

diff --cc src/test/test_hs_intropoint.c index dbd884c,f8f4460..e126cbc --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@@ -12,15 -12,18 +12,19 @@@ #define CIRCUITLIST_PRIVATE

#include "test.h" +#include "log_test_helpers.h" #include "crypto.h" + #include "log_test_helpers.h"

#include "or.h" #include "ht.h"

+ /* Trunnel. */ #include "hs/cell_establish_intro.h" - #include "hs_common.h" + #include "hs/cell_introduce1.h" + #include "hs/cell_common.h" - #include "hs_service.h" ++#include "hs_common.h" #include "hs_circuitmap.h" #include "hs_intropoint.h"

@@@ -515,15 -673,18 +831,27 @@@ struct testcase_t hs_intropoint_tests[ { "receive_establish_intro_wrong_sig", test_establish_intro_wrong_sig, TT_FORK, NULL, NULL },

+ { "receive_establish_intro_wrong_sig_len", + test_establish_intro_wrong_sig_len, TT_FORK, NULL, NULL }, + + { "receive_establish_intro_wrong_auth_key_len", + test_establish_intro_wrong_auth_key_len, TT_FORK, NULL, NULL }, + + { "receive_establish_intro_wrong_mac", + test_establish_intro_wrong_mac, TT_FORK, NULL, NULL }, + + { "introduce1_suitable_circuit", + test_introduce1_suitable_circuit, TT_FORK, NULL, NULL }, + + { "introduce1_is_legacy", + test_introduce1_is_legacy, TT_FORK, NULL, NULL }, + + { "introduce1_validation", + test_introduce1_validation, TT_FORK, NULL, NULL }, + + { "received_introduce1_handling", + test_received_introduce1_handling, TT_FORK, NULL, NULL }, + END_OF_TESTCASES };