summaryrefslogtreecommitdiff
path: root/src/or/routerkeys.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-01-30 08:40:46 -0500
committerNick Mathewson <nickm@torproject.org>2017-01-30 08:40:46 -0500
commit558c04f5b119b62f5a6ef00739468b31f65fcc19 (patch)
tree6e9b638f24d252a5bf2c5a8b779bc3707196e78a /src/or/routerkeys.c
parent67eb6470d711b36d1b855e6423ce7bbb302af834 (diff)
parentd71fc474385281453eaa93522479d32af85c94ef (diff)
downloadtor-558c04f5b119b62f5a6ef00739468b31f65fcc19.tar.gz
tor-558c04f5b119b62f5a6ef00739468b31f65fcc19.zip
Merge branch 'combined-fuzzing-v4'
Diffstat (limited to 'src/or/routerkeys.c')
-rw-r--r--src/or/routerkeys.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index e20787123e..6259e3f5a0 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -1210,12 +1210,12 @@ make_tap_onion_key_crosscert(const crypto_pk_t *onion_key,
/** Check whether an RSA-TAP cross-certification is correct. Return 0 if it
* is, -1 if it isn't. */
-int
-check_tap_onion_key_crosscert(const uint8_t *crosscert,
- int crosscert_len,
- const crypto_pk_t *onion_pkey,
- const ed25519_public_key_t *master_id_pkey,
- const uint8_t *rsa_id_digest)
+MOCK_IMPL(int,
+check_tap_onion_key_crosscert,(const uint8_t *crosscert,
+ int crosscert_len,
+ const crypto_pk_t *onion_pkey,
+ const ed25519_public_key_t *master_id_pkey,
+ const uint8_t *rsa_id_digest))
{
uint8_t *cc = tor_malloc(crypto_pk_keysize(onion_pkey));
int cc_len =