diff options
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 202 |
1 files changed, 0 insertions, 202 deletions
diff --git a/src/or/main.c b/src/or/main.c index 581f83d90c..f630a8a409 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -34,42 +34,8 @@ static int please_reset=0; /* whether we just got a sighup */ static int please_reap_children=0; /* whether we should waitpid for exited children */ #endif /* signal stuff */ -/* private keys */ -static crypto_pk_env_t *onionkey=NULL; -static crypto_pk_env_t *linkkey=NULL; -static crypto_pk_env_t *identitykey=NULL; - /********* END VARIABLES ************/ -void set_onion_key(crypto_pk_env_t *k) { - onionkey = k; -} - -crypto_pk_env_t *get_onion_key(void) { - assert(onionkey); - return onionkey; -} - -void set_link_key(crypto_pk_env_t *k) -{ - linkkey = k; -} - -crypto_pk_env_t *get_link_key(void) -{ - assert(linkkey); - return linkkey; -} - -void set_identity_key(crypto_pk_env_t *k) { - identitykey = k; -} - -crypto_pk_env_t *get_identity_key(void) { - assert(identitykey); - return identitykey; -} - /**************************************************************************** * * This section contains accessors and other methods on the connection_array @@ -427,174 +393,6 @@ static int prepare_for_poll(void) { return (1000 - (now.tv_usec / 1000)); /* how many milliseconds til the next second? */ } -static crypto_pk_env_t *init_key_from_file(const char *fname) -{ - crypto_pk_env_t *prkey = NULL; - int fd = -1; - FILE *file = NULL; - - if (!(prkey = crypto_new_pk_env(CRYPTO_PK_RSA))) { - log(LOG_ERR, "Error creating crypto environment."); - goto error; - } - - switch(file_status(fname)) { - case FN_DIR: - case FN_ERROR: - log(LOG_ERR, "Can't read key from %s", fname); - goto error; - case FN_NOENT: - log(LOG_INFO, "No key found in %s; generating fresh key.", fname); - if (crypto_pk_generate_key(prkey)) { - log(LOG_ERR, "Error generating key: %s", crypto_perror()); - goto error; - } - if (crypto_pk_check_key(prkey) <= 0) { - log(LOG_ERR, "Generated key seems invalid"); - goto error; - } - log(LOG_INFO, "Generated key seems valid"); - if (crypto_pk_write_private_key_to_filename(prkey, fname)) { - log(LOG_ERR, "Couldn't write generated key to %s.", fname); - goto error; - } - return prkey; - case FN_FILE: - if (crypto_pk_read_private_key_from_filename(prkey, fname)) { - log(LOG_ERR, "Error loading private key."); - goto error; - } - return prkey; - default: - assert(0); - } - - error: - if (prkey) - crypto_free_pk_env(prkey); - if (fd >= 0 && !file) - close(fd); - if (file) - fclose(file); - return NULL; -} - -static int init_keys(void) -{ - char keydir[512]; - char fingerprint[FINGERPRINT_LEN+MAX_NICKNAME_LEN+3]; - char *cp; - const char *tmp, *mydesc; - crypto_pk_env_t *prkey; - - /* OP's don't need keys. Just initialize the TLS context.*/ - if (!options.ORPort) { - assert(!options.DirPort); - if (tor_tls_context_new(NULL, 0, NULL)<0) { - log_fn(LOG_ERR, "Error creating TLS context for OP."); - return -1; - } - return 0; - } - assert(options.DataDirectory); - if (strlen(options.DataDirectory) > (512-128)) { - log_fn(LOG_ERR, "DataDirectory is too long."); - return -1; - } - if (check_private_dir(options.DataDirectory, 1)) { - return -1; - } - sprintf(keydir,"%s/keys",options.DataDirectory); - if (check_private_dir(keydir, 1)) { - return -1; - } - cp = keydir + strlen(keydir); /* End of string. */ - - /* 1. Read identity key. Make it if none is found. */ - strcpy(cp, "/identity.key"); - log_fn(LOG_INFO,"Reading/making identity key %s...",keydir); - prkey = init_key_from_file(keydir); - if (!prkey) return -1; - set_identity_key(prkey); - /* 2. Read onion key. Make it if none is found. */ - strcpy(cp, "/onion.key"); - log_fn(LOG_INFO,"Reading/making onion key %s...",keydir); - prkey = init_key_from_file(keydir); - if (!prkey) return -1; - set_onion_key(prkey); - - /* 3. Initialize link key and TLS context. */ - strcpy(cp, "/link.key"); - log_fn(LOG_INFO,"Reading/making link key %s...",keydir); - prkey = init_key_from_file(keydir); - if (!prkey) return -1; - set_link_key(prkey); - if (tor_tls_context_new(prkey, 1, options.Nickname) < 0) { - log_fn(LOG_ERR, "Error initializing TLS context"); - return -1; - } - /* 4. Dump router descriptor to 'router.desc' */ - /* Must be called after keys are initialized. */ - if (!(router_get_my_descriptor())) { - log_fn(LOG_ERR, "Error initializing descriptor."); - return -1; - } - /* We need to add our own fingerprint so it gets recognized. */ - if (dirserv_add_own_fingerprint(options.Nickname, get_identity_key())) { - log_fn(LOG_ERR, "Error adding own fingerprint to approved set"); - return -1; - } - tmp = mydesc = router_get_my_descriptor(); - if (dirserv_add_descriptor(&tmp)) { - log(LOG_ERR, "Unable to add own descriptor to directory."); - return -1; - } - sprintf(keydir,"%s/router.desc", options.DataDirectory); - log_fn(LOG_INFO,"Dumping descriptor to %s...",keydir); - if (write_str_to_file(keydir, mydesc)) { - return -1; - } - /* 5. Dump fingerprint to 'fingerprint' */ - sprintf(keydir,"%s/fingerprint", options.DataDirectory); - log_fn(LOG_INFO,"Dumping fingerprint to %s...",keydir); - assert(strlen(options.Nickname) <= MAX_NICKNAME_LEN); - strcpy(fingerprint, options.Nickname); - strcat(fingerprint, " "); - if (crypto_pk_get_fingerprint(get_identity_key(), - fingerprint+strlen(fingerprint))<0) { - log_fn(LOG_ERR, "Error computing fingerprint"); - return -1; - } - strcat(fingerprint, "\n"); - if (write_str_to_file(keydir, fingerprint)) - return -1; - if(!options.DirPort) - return 0; - /* 6. [dirserver only] load approved-routers file */ - sprintf(keydir,"%s/approved-routers", options.DataDirectory); - log_fn(LOG_INFO,"Loading approved fingerprints from %s...",keydir); - if(dirserv_parse_fingerprint_file(keydir) < 0) { - log_fn(LOG_ERR, "Error loading fingerprints"); - return -1; - } - /* 7. [dirserver only] load old directory, if it's there */ - sprintf(keydir,"%s/cached-directory", options.DataDirectory); - log_fn(LOG_INFO,"Loading cached directory from %s...",keydir); - cp = read_file_to_str(keydir); - if(!cp) { - log_fn(LOG_INFO,"Cached directory %s not present. Ok.",keydir); - } else { - if(dirserv_init_from_directory_string(cp) < 0) { - log_fn(LOG_ERR, "Cached directory %s is corrupt", keydir); - free(cp); - return -1; - } - free(cp); - } - /* success */ - return 0; -} - static int init_from_config(int argc, char **argv) { static int have_daemonized=0; |