diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-16 09:07:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-28 10:41:50 -0400 |
| commit | 55bb7bbafd1272a1bc36a17d89bd2419d59b113a (patch) | |
| tree | 98a870d6603b5ee394975395f7c40a02d882cedd /src/or | |
| parent | b75361c5ed717cde787c1b4f36e8fb51ccfddc2b (diff) | |
| download | tor-55bb7bbafd1272a1bc36a17d89bd2419d59b113a.tar.gz tor-55bb7bbafd1272a1bc36a17d89bd2419d59b113a.zip | |
Tests for AUTHENTICATE cell functionality.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/channel.c | 8 | ||||
| -rw-r--r-- | src/or/channel.h | 5 | ||||
| -rw-r--r-- | src/or/channeltls.c | 4 | ||||
| -rw-r--r-- | src/or/channeltls.h | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index bf0387f10e..af095026e4 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -4431,10 +4431,10 @@ channel_num_circuits(channel_t *chan) * This is called when setting up a channel and replaces the old * connection_or_set_circid_type() */ -void -channel_set_circid_type(channel_t *chan, - crypto_pk_t *identity_rcvd, - int consider_identity) +MOCK_IMPL(void, +channel_set_circid_type,(channel_t *chan, + crypto_pk_t *identity_rcvd, + int consider_identity)) { int started_here; crypto_pk_t *our_identity; diff --git a/src/or/channel.h b/src/or/channel.h index ecc2a092e4..2b38ca7e19 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -562,8 +562,9 @@ int channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info); int channel_matches_target_addr_for_extend(channel_t *chan, const tor_addr_t *target); unsigned int channel_num_circuits(channel_t *chan); -void channel_set_circid_type(channel_t *chan, crypto_pk_t *identity_rcvd, - int consider_identity); +MOCK_DECL(void,channel_set_circid_type,(channel_t *chan, + crypto_pk_t *identity_rcvd, + int consider_identity)); void channel_timestamp_client(channel_t *chan); void channel_update_xmit_queue_size(channel_t *chan); diff --git a/src/or/channeltls.c b/src/or/channeltls.c index af7f474349..af63444f15 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -90,8 +90,6 @@ static void channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *tlschan); static void channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *tlschan); -static void channel_tls_process_authenticate_cell(var_cell_t *cell, - channel_tls_t *tlschan); static int command_allowed_before_handshake(uint8_t command); static int enter_v3_handshake_with_cell(var_cell_t *cell, channel_tls_t *tlschan); @@ -2037,7 +2035,7 @@ channel_tls_process_auth_challenge_cell(var_cell_t *cell, channel_tls_t *chan) * the identity of the router on the other side of the connection. */ -static void +STATIC void channel_tls_process_authenticate_cell(var_cell_t *cell, channel_tls_t *chan) { uint8_t expected[V3_AUTH_FIXED_PART_LEN]; diff --git a/src/or/channeltls.h b/src/or/channeltls.h index 69f6e629c4..a0df9faac2 100644 --- a/src/or/channeltls.h +++ b/src/or/channeltls.h @@ -58,6 +58,8 @@ STATIC void channel_tls_process_certs_cell(var_cell_t *cell, STATIC void channel_tls_process_auth_challenge_cell(var_cell_t *cell, channel_tls_t *tlschan); STATIC void channel_tls_common_init(channel_tls_t *tlschan); +STATIC void channel_tls_process_authenticate_cell(var_cell_t *cell, + channel_tls_t *tlschan); #endif #endif |