aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay/router.c
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-02-18 17:37:47 +1000
committerteor <teor@torproject.org>2019-02-19 21:44:41 +1000
commit8e5df40018acd0bd80626073b16b6cc070129109 (patch)
treebd2cac406762ab234c455a98de1713077dba119f /src/feature/relay/router.c
parent7a2c8dadedcb3b17195111fee7aa91695d6bf6bb (diff)
downloadtor-8e5df40018acd0bd80626073b16b6cc070129109.tar.gz
tor-8e5df40018acd0bd80626073b16b6cc070129109.zip
test_dir: Test rsa + ed25519 extrainfo creation and parsing
Also fix a missing mock in rsa-only parsing.
Diffstat (limited to 'src/feature/relay/router.c')
-rw-r--r--src/feature/relay/router.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 18c8375299..cbd5f2f91e 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -271,11 +271,12 @@ expire_old_onion_keys(void)
/** Return the current secret onion key for the ntor handshake. Must only
* be called from the main thread. */
-static const curve25519_keypair_t *
-get_current_curve25519_keypair(void)
+MOCK_IMPL(STATIC const struct curve25519_keypair_t *,
+get_current_curve25519_keypair,(void))
{
return &curve25519_onion_key;
}
+
/** Return a map from KEYID (the key itself) to keypairs for use in the ntor
* handshake. Must only be called from the main thread. */
di_digest256_map_t *