aboutsummaryrefslogtreecommitdiff
path: root/src/or/hs_descriptor.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-04 13:26:56 -0400
committerNick Mathewson <nickm@torproject.org>2016-11-04 13:26:56 -0400
commitd88046a80d35bfc05c2b41e352beb9567262c53c (patch)
tree25f10fc479e2acdce13a17bbc76ba4d568c54250 /src/or/hs_descriptor.c
parentc35c43d7d9df793c890deb14800e24327fbca452 (diff)
downloadtor-d88046a80d35bfc05c2b41e352beb9567262c53c.tar.gz
tor-d88046a80d35bfc05c2b41e352beb9567262c53c.zip
Fix compilation.
Diffstat (limited to 'src/or/hs_descriptor.c')
-rw-r--r--src/or/hs_descriptor.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c
index a0ddf272fc..f89bd4bf63 100644
--- a/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@ -834,20 +834,6 @@ desc_encode_v3(const hs_descriptor_t *desc, char **encoded_out)
/* === DECODING === */
-/* XXX: Stub until this function is upstream. */
-static int
-rsa_ed25519_crosscert_check(const uint8_t *crosscert,
- const size_t crosscert_len,
- const crypto_pk_t *rsa_id_key,
- const ed25519_public_key_t *master_key)
-{
- (void) crosscert;
- (void) crosscert_len;
- (void) rsa_id_key;
- (void) master_key;
- return 0;
-}
-
/* Given an encoded string of the link specifiers, return a newly allocated
* list of decoded link specifiers. Return NULL on error. */
STATIC smartlist_t *
@@ -1304,7 +1290,8 @@ decode_introduction_point(const hs_descriptor_t *desc, const char *start)
}
if (rsa_ed25519_crosscert_check((const uint8_t *) tok->object_body,
tok->object_size, ip->enc_key.legacy,
- &desc->plaintext_data.signing_key_cert->signing_key)) {
+ &desc->plaintext_data.signing_key_cert->signing_key,
+ approx_time()-86400)) {
log_warn(LD_REND, "Unable to cross certify the introduction point "
"legacy encryption key.");
goto err;