commit d88046a80d35bfc05c2b41e352beb9567262c53c Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 4 13:26:56 2016 -0400

Fix compilation. --- src/or/hs_descriptor.c | 17 ++--------------- src/or/hs_descriptor.h | 1 + 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index a0ddf27..f89bd4b 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; diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index b48079e..0c30a52 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -11,6 +11,7 @@

#include <stdint.h>

+#include "or.h" #include "address.h" #include "container.h" #include "crypto.h"