diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-30 09:44:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-03 08:37:22 -0400 |
| commit | 99b3e54691f451b766556391cba6e26120ad7d84 (patch) | |
| tree | 5a2eec11702909d0a02680c317e68ff89a657dc4 /src/test/test_channeltls.c | |
| parent | 0704fa8a63c2e203162c359e184e63b10c45630c (diff) | |
| download | tor-99b3e54691f451b766556391cba6e26120ad7d84.tar.gz tor-99b3e54691f451b766556391cba6e26120ad7d84.zip | |
Add "Ed ID" arguments to a bunch of connection-ID-related fns.
In particular, these functions are the ones that set the identity of
a given connection or channel, and/or confirm that we have learned
said IDs.
There's a lot of stub code here: we don't actually need to use the
new keys till we start looking up connections/channels by Ed25519
IDs. Still, we want to start passing the Ed25519 IDs in now, so it
makes sense to add these stubs as part of 15055.
Diffstat (limited to 'src/test/test_channeltls.c')
| -rw-r--r-- | src/test/test_channeltls.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index bde46a2998..36ae4d16e2 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -30,6 +30,7 @@ static or_connection_t * tlschan_connection_or_connect_mock( const tor_addr_t *addr, uint16_t port, const char *digest, + const ed25519_public_key_t *ed_id, channel_tls_t *tlschan); static int tlschan_is_local_addr_mock(const tor_addr_t *addr); @@ -68,7 +69,7 @@ test_channeltls_create(void *arg) MOCK(connection_or_connect, tlschan_connection_or_connect_mock); /* Try connecting */ - ch = channel_tls_connect(&test_addr, 567, test_digest); + ch = channel_tls_connect(&test_addr, 567, test_digest, NULL); tt_assert(ch != NULL); done: @@ -117,7 +118,7 @@ test_channeltls_num_bytes_queued(void *arg) MOCK(connection_or_connect, tlschan_connection_or_connect_mock); /* Try connecting */ - ch = channel_tls_connect(&test_addr, 567, test_digest); + ch = channel_tls_connect(&test_addr, 567, test_digest, NULL); tt_assert(ch != NULL); /* @@ -202,7 +203,7 @@ test_channeltls_overhead_estimate(void *arg) MOCK(connection_or_connect, tlschan_connection_or_connect_mock); /* Try connecting */ - ch = channel_tls_connect(&test_addr, 567, test_digest); + ch = channel_tls_connect(&test_addr, 567, test_digest, NULL); tt_assert(ch != NULL); /* First case: silly low ratios should get clamped to 1.0 */ @@ -264,9 +265,11 @@ static or_connection_t * tlschan_connection_or_connect_mock(const tor_addr_t *addr, uint16_t port, const char *digest, + const ed25519_public_key_t *ed_id, channel_tls_t *tlschan) { or_connection_t *result = NULL; + (void) ed_id; // XXXX Not yet used. tt_assert(addr != NULL); tt_assert(port != 0); |