Commit e425ffc6 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Disable routerkeys.c with --disable-relay-mode.

parent dd4fa9b4

src/core/or/include.am

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
LIBTOR_APP_A_SOURCES += 				\

	src/core/or/address_set.c		\

	src/core/or/channel.c			\

	src/core/or/relay_handshake.c		\

	src/core/or/channelpadding.c		\

	src/core/or/channeltls.c		\

	src/core/or/circuitbuild.c		\
@@ -29,6 +28,7 @@ LIBTOR_APP_A_SOURCES += \ 
	src/core/or/protover_rust.c		\

	src/core/or/reasons.c			\

	src/core/or/relay.c			\

	src/core/or/relay_handshake.c		\

	src/core/or/scheduler.c			\

	src/core/or/scheduler_kist.c		\

	src/core/or/scheduler_vanilla.c		\
@@ -43,7 +43,6 @@ noinst_HEADERS += \ 
	src/core/or/cell_queue_st.h			\

	src/core/or/cell_st.h				\

	src/core/or/channel.h				\

	src/core/or/relay_handshake.h			\

	src/core/or/channelpadding.h			\

	src/core/or/channeltls.h			\

	src/core/or/circuit_st.h			\
@@ -90,6 +89,7 @@ noinst_HEADERS += \ 
	src/core/or/reasons.h				\

	src/core/or/relay.h				\

	src/core/or/relay_crypto_st.h			\

	src/core/or/relay_handshake.h			\

	src/core/or/scheduler.h				\

	src/core/or/sendme.h				\

	src/core/or/server_port_cfg_st.h		\

src/feature/relay/include.am

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
# Legacy shared relay code: migrate to the relay module over time

LIBTOR_APP_A_SOURCES += 			\

	src/feature/relay/onion_queue.c		\

	src/feature/relay/router.c		\

	src/feature/relay/routerkeys.c

	src/feature/relay/router.c



# The Relay module.
@@ -15,6 +14,7 @@ MODULE_RELAY_SOURCES = \ 
	src/feature/relay/relay_config.c			\

	src/feature/relay/relay_periodic.c			\

	src/feature/relay/relay_sys.c				\

	src/feature/relay/routerkeys.c				\

	src/feature/relay/selftest.c				\

	src/feature/relay/transport_config.c

src/feature/relay/routerkeys.h

+82 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


#include "lib/crypt_ops/crypto_ed25519.h"



#ifdef HAVE_MODULE_RELAY



const ed25519_public_key_t *get_master_identity_key(void);

MOCK_DECL(const ed25519_keypair_t *, get_master_signing_keypair,(void));

MOCK_DECL(const struct tor_cert_st *, get_master_signing_key_cert,(void));
@@ -24,6 +26,7 @@ void get_master_rsa_crosscert(const uint8_t **cert_out, 


int router_ed25519_id_is_me(const ed25519_public_key_t *id);



/* These are only used by router.c */

struct tor_cert_st *make_ntor_onion_key_crosscert(

                                  const curve25519_keypair_t *onion_key,

                                  const ed25519_public_key_t *master_id_key,
@@ -42,6 +45,85 @@ int generate_ed_link_cert(const or_options_t *options, time_t now, int force); 


void routerkeys_free_all(void);



#else /* !defined(HAVE_MODULE_RELAY) */



#define router_ed25519_id_is_me(id) \

  ((void)(id), 0)



static inline void *

relay_key_is_unavailable_(void)

{

  tor_assert_nonfatal_unreached();

  return NULL;

}

#define relay_key_is_unavailable(type) \

  ((type)(relay_key_is_unavailable_()))



// Many of these can be removed once relay_handshake.c is relay-only.

#define get_current_auth_keypair() \

  relay_key_is_unavailable(const ed25519_keypair_t *)

#define get_master_signing_keypair() \

  relay_key_is_unavailable(const ed25519_keypair_t *)

#define get_current_link_cert_cert() \

  relay_key_is_unavailable(const struct tor_cert_st *)

#define get_current_auth_key_cert() \

  relay_key_is_unavailable(const struct tor_cert_st *)

#define get_master_signing_key_cert() \

  relay_key_is_unavailable(const struct tor_cert_st *)

#define get_master_rsa_crosscert(cert_out, size_out) \

  STMT_BEGIN                                         \

  tor_assert_nonfatal_unreached();                   \

  *(cert_out) = NULL;                                \

  *(size_out) = 0;                                   \

  STMT_END

#define get_master_identity_key() \

  relay_key_is_unavailable(const ed25519_public_key_t *)



#define generate_ed_link_cert(options, now, force) \

  ((void)(options), (void)(now), (void)(force), 0)

#define should_make_new_ed_keys(options, now) \

  ((void)(options), (void)(now), 0)



// These can get removed once router.c becomes relay-only.

static inline struct tor_cert_st *

make_ntor_onion_key_crosscert(const curve25519_keypair_t *onion_key,

                              const ed25519_public_key_t *master_id_key,

                              time_t now, time_t lifetime,

                              int *sign_out)

{

  (void)onion_key;

  (void)master_id_key;

  (void)now;

  (void)lifetime;

  (void)sign_out;

  tor_assert_nonfatal_unreached();

  return NULL;

}

static inline uint8_t *

make_tap_onion_key_crosscert(const crypto_pk_t *onion_key,

                             const ed25519_public_key_t *master_id_key,

                             const crypto_pk_t *rsa_id_key,

                             int *len_out)

{

  (void)onion_key;

  (void)master_id_key;

  (void)rsa_id_key;

  (void)len_out;

  tor_assert_nonfatal_unreached();

  return NULL;

}



/* This calls is used outside of relay mode, but only to implement

 * CMD_KEY_EXPIRATION */

#define log_cert_expiration()                                           \

  (puts("Not available: Tor has been compiled without relay support"), 0)

/* This calls is used outside of relay mode, but only to implement

 * CMD_KEYGEN. */

#define load_ed_keys(x,y)                                                \

  (puts("Not available: Tor has been compiled without relay support"), 0)



#endif /* defined(HAVE_MODULE_RELAY) */



#ifdef TOR_UNIT_TESTS

const ed25519_keypair_t *get_master_identity_keypair(void);

void init_mock_ed_keys(const crypto_pk_t *rsa_identity_key);