Move key-loading and crosscert-checking out of feature/relay

This is also used by onion services, so it needs to go in another
module.

1 files changed, 0 insertions, 41 deletions

diff --git a/src/feature/relay/routerkeys.h b/src/feature/relay/routerkeys.h
index f52ed0f306..c5a58e553d 100644
--- a/src/feature/relay/routerkeys.h
+++ b/src/feature/relay/routerkeys.h
@@ -6,35 +6,6 @@
 
 #include "lib/crypt_ops/crypto_ed25519.h"
 
-#define INIT_ED_KEY_CREATE                      (1u<<0)
-#define INIT_ED_KEY_REPLACE                     (1u<<1)
-#define INIT_ED_KEY_SPLIT                       (1u<<2)
-#define INIT_ED_KEY_MISSING_SECRET_OK           (1u<<3)
-#define INIT_ED_KEY_NEEDCERT                    (1u<<4)
-#define INIT_ED_KEY_EXTRA_STRONG                (1u<<5)
-#define INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT (1u<<6)
-#define INIT_ED_KEY_OMIT_SECRET                 (1u<<7)
-#define INIT_ED_KEY_TRY_ENCRYPTED               (1u<<8)
-#define INIT_ED_KEY_NO_REPAIR                   (1u<<9)
-#define INIT_ED_KEY_SUGGEST_KEYGEN              (1u<<10)
-#define INIT_ED_KEY_OFFLINE_SECRET              (1u<<11)
-#define INIT_ED_KEY_EXPLICIT_FNAME              (1u<<12)
-
-struct tor_cert_st;
-ed25519_keypair_t *ed_key_init_from_file(const char *fname, uint32_t flags,
-                                         int severity,
-                                         const ed25519_keypair_t *signing_key,
-                                         time_t now,
-                                         time_t lifetime,
-                                         uint8_t cert_type,
-                                         struct tor_cert_st **cert_out,
-                                         const or_options_t *options);
-ed25519_keypair_t *ed_key_new(const ed25519_keypair_t *signing_key,
-                              uint32_t flags,
-                              time_t now,
-                              time_t lifetime,
-                              uint8_t cert_type,
-                              struct tor_cert_st **cert_out);
 const ed25519_public_key_t *get_master_identity_key(void);
 const ed25519_keypair_t *get_master_signing_keypair(void);
 const struct tor_cert_st *get_master_signing_key_cert(void);
@@ -58,23 +29,12 @@ uint8_t *make_tap_onion_key_crosscert(const crypto_pk_t *onion_key,
                                   const crypto_pk_t *rsa_id_key,
                                   int *len_out);
 
-MOCK_DECL(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));
-
 int log_cert_expiration(void);
 int load_ed_keys(const or_options_t *options, time_t now);
 int should_make_new_ed_keys(const or_options_t *options, const time_t now);
 
 int generate_ed_link_cert(const or_options_t *options, time_t now, int force);
 
-int read_encrypted_secret_key(ed25519_secret_key_t *out,
-                              const char *fname);
-int write_encrypted_secret_key(const ed25519_secret_key_t *out,
-                               const char *fname);
-
 void routerkeys_free_all(void);
 
 #ifdef TOR_UNIT_TESTS
@@ -83,4 +43,3 @@ void init_mock_ed_keys(const crypto_pk_t *rsa_identity_key);
 #endif
 
 #endif /* !defined(TOR_ROUTERKEYS_H) */
-