aboutsummaryrefslogtreecommitdiff
path: root/src/feature/control/control.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-03-25 14:03:49 -0400
committerNick Mathewson <nickm@torproject.org>2019-03-25 14:06:56 -0400
commit2917ecaa970c8fabcc0e9875b1e87c0d279ab1b3 (patch)
tree48f58753adae02b1e1c8957b48d5c143e87377a5 /src/feature/control/control.h
parent4754e9058b7521967dd92092e54483cec456bb2f (diff)
downloadtor-2917ecaa970c8fabcc0e9875b1e87c0d279ab1b3.tar.gz
tor-2917ecaa970c8fabcc0e9875b1e87c0d279ab1b3.zip
Split command-handling and authentication from control.c
Diffstat (limited to 'src/feature/control/control.h')
-rw-r--r--src/feature/control/control.h30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/feature/control/control.h b/src/feature/control/control.h
index 810fe67843..d20bc6fa2b 100644
--- a/src/feature/control/control.h
+++ b/src/feature/control/control.h
@@ -42,10 +42,6 @@ void connection_control_closed(control_connection_t *conn);
int connection_control_process_inbuf(control_connection_t *conn);
-int init_control_cookie_authentication(int enabled);
-char *get_controller_cookie_file_name(void);
-struct config_line_t;
-smartlist_t *decode_hashed_passwords(struct config_line_t *passwords);
void disable_control_logging(void);
void enable_control_logging(void);
@@ -55,40 +51,14 @@ const char *rend_auth_type_to_string(rend_auth_type_t auth_type);
MOCK_DECL(const char *, node_describe_longname_by_id,(const char *id_digest));
void control_free_all(void);
-#ifdef CONTROL_PRIVATE
-#include "lib/crypt_ops/crypto_ed25519.h"
-
-/* ADD_ONION secret key to create an ephemeral service. The command supports
- * multiple versions so this union stores the key and passes it to the HS
- * subsystem depending on the requested version. */
-typedef union add_onion_secret_key_t {
- /* Hidden service v2 secret key. */
- crypto_pk_t *v2;
- /* Hidden service v3 secret key. */
- ed25519_secret_key_t *v3;
-} add_onion_secret_key_t;
-
-STATIC int add_onion_helper_keyarg(const char *arg, int discard_pk,
- const char **key_new_alg_out,
- char **key_new_blob_out,
- add_onion_secret_key_t *decoded_key,
- int *hs_version, char **err_msg_out);
-
-STATIC rend_authorized_client_t *
-add_onion_helper_clientauth(const char *arg, int *created, char **err_msg_out);
-
-#endif /* defined(CONTROL_PRIVATE) */
-
#ifdef CONTROL_MODULE_PRIVATE
struct signal_name_t {
int sig;
const char *signal_name;
};
extern const struct signal_name_t signal_table[];
-
int get_cached_network_liveness(void);
void set_cached_network_liveness(int liveness);
-smartlist_t * get_detached_onion_services(void);
#endif /* defined(CONTROL_MODULE_PRIVATE) */
#endif /* !defined(TOR_CONTROL_H) */