|
@@ -942,15 +942,25 @@ test_link_handshake_send_authchallenge(void *arg)
|
|
|
cell1 = mock_got_var_cell;
|
|
|
tt_int_op(0, OP_EQ, connection_or_send_auth_challenge_cell(c1));
|
|
|
cell2 = mock_got_var_cell;
|
|
|
+#ifdef HAVE_WORKING_TOR_TLS_GET_TLSSECRETS
|
|
|
tt_int_op(38, OP_EQ, cell1->payload_len);
|
|
|
tt_int_op(38, OP_EQ, cell2->payload_len);
|
|
|
+#else
|
|
|
+ tt_int_op(36, OP_EQ, cell1->payload_len);
|
|
|
+ tt_int_op(36, OP_EQ, cell2->payload_len);
|
|
|
+#endif
|
|
|
tt_int_op(0, OP_EQ, cell1->circ_id);
|
|
|
tt_int_op(0, OP_EQ, cell2->circ_id);
|
|
|
tt_int_op(CELL_AUTH_CHALLENGE, OP_EQ, cell1->command);
|
|
|
tt_int_op(CELL_AUTH_CHALLENGE, OP_EQ, cell2->command);
|
|
|
|
|
|
+#ifdef HAVE_WORKING_TOR_TLS_GET_TLSSECRETS
|
|
|
tt_mem_op("\x00\x02\x00\x01\x00\x03", OP_EQ, cell1->payload + 32, 6);
|
|
|
tt_mem_op("\x00\x02\x00\x01\x00\x03", OP_EQ, cell2->payload + 32, 6);
|
|
|
+#else
|
|
|
+ tt_mem_op("\x00\x01\x00\x03", OP_EQ, cell1->payload + 32, 4);
|
|
|
+ tt_mem_op("\x00\x01\x00\x03", OP_EQ, cell2->payload + 32, 4);
|
|
|
+#endif
|
|
|
tt_mem_op(cell1->payload, OP_NE, cell2->payload, 32);
|
|
|
|
|
|
done:
|
|
@@ -992,6 +1002,8 @@ static void *
|
|
|
recv_authchallenge_setup(const struct testcase_t *test)
|
|
|
{
|
|
|
(void)test;
|
|
|
+
|
|
|
+ testing__connection_or_pretend_TLSSECRET_is_supported = 1;
|
|
|
authchallenge_data_t *d = tor_malloc_zero(sizeof(*d));
|
|
|
d->c = or_connection_new(CONN_TYPE_OR, AF_INET);
|
|
|
d->chan = tor_malloc_zero(sizeof(*d->chan));
|
|
@@ -1205,6 +1217,8 @@ authenticate_data_setup(const struct testcase_t *test)
|
|
|
authenticate_data_t *d = tor_malloc_zero(sizeof(*d));
|
|
|
int is_ed = d->is_ed = (test->setup_data == (void*)3);
|
|
|
|
|
|
+ testing__connection_or_pretend_TLSSECRET_is_supported = 1;
|
|
|
+
|
|
|
scheduler_init();
|
|
|
|
|
|
MOCK(connection_or_write_var_cell_to_buf, mock_write_var_cell);
|