nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ahf/ahf/bugs/21266'

Browse Source
This commit is contained in:
Nick Mathewson 2017-02-02 08:40:05 -05:00
commit fc3e742b5b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/test_hs_intropoint.c
View File

@ -146,8 +146,11 @@ test_establish_intro_wrong_purpose(void *arg)
establish_intro_cell); establish_intro_cell);
tt_int_op(cell_len, >, 0); tt_int_op(cell_len, >, 0);
/* Receive the cell */ /* Receive the cell. Should fail. */
setup_full_capture_of_logs(LOG_INFO);
retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len); retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len);
expect_log_msg_containing("Rejecting ESTABLISH_INTRO on non-OR circuit.");
teardown_capture_of_logs();
tt_int_op(retval, ==, -1); tt_int_op(retval, ==, -1);
done: done:
@ -180,7 +183,10 @@ test_establish_intro_wrong_keytype(void *arg)
helper_prepare_circ_for_intro(intro_circ, circuit_key_material); helper_prepare_circ_for_intro(intro_circ, circuit_key_material);
/* Receive the cell. Should fail. */ /* Receive the cell. Should fail. */
setup_full_capture_of_logs(LOG_INFO);
retval = hs_intro_received_establish_intro(intro_circ, (uint8_t*)"", 0); retval = hs_intro_received_establish_intro(intro_circ, (uint8_t*)"", 0);
expect_log_msg_containing("Empty ESTABLISH_INTRO cell.");
teardown_capture_of_logs();
tt_int_op(retval, ==, -1); tt_int_op(retval, ==, -1);
done: done:
@ -217,7 +223,10 @@ test_establish_intro_wrong_keytype2(void *arg)
cell_body[0] = 42; cell_body[0] = 42;
/* Receive the cell. Should fail. */ /* Receive the cell. Should fail. */
setup_full_capture_of_logs(LOG_INFO);
retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len); retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len);
expect_log_msg_containing("Unrecognized AUTH_KEY_TYPE 42.");
teardown_capture_of_logs();
tt_int_op(retval, ==, -1); tt_int_op(retval, ==, -1);
done: done:
@ -413,7 +422,10 @@ test_establish_intro_wrong_sig(void *arg)
cell_body[cell_len-1]++; cell_body[cell_len-1]++;
/* Receive the cell. Should fail. */ /* Receive the cell. Should fail. */
setup_full_capture_of_logs(LOG_INFO);
retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len); retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len);
expect_log_msg_containing("Failed to verify ESTABLISH_INTRO cell.");
teardown_capture_of_logs();
tt_int_op(retval, ==, -1); tt_int_op(retval, ==, -1);
done: done: