nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename get_client_identity_key to get_tlsclient_identity_key

Browse Source
This commit is contained in:
Nick Mathewson 2010-10-21 13:53:31 -04:00
parent a2bb0bfdd5
commit 704076680a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/connection_or.c
View File

@ -1008,7 +1008,7 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn,
safe_str_client(conn->_base.address); safe_str_client(conn->_base.address);
const char *conn_type = started_here ? "outgoing" : "incoming"; const char *conn_type = started_here ? "outgoing" : "incoming";
crypto_pk_env_t *our_identity = crypto_pk_env_t *our_identity =
started_here ? get_client_identity_key() : started_here ? get_tlsclient_identity_key() :
get_server_identity_key(); get_server_identity_key();
int has_cert = 0, has_identity=0; int has_cert = 0, has_identity=0;

2
src/or/main.c
View File

@ -932,7 +932,7 @@ run_scheduled_events(time_t now)
if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) { if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) {
log_info(LD_GENERAL,"Rotating tls context."); log_info(LD_GENERAL,"Rotating tls context.");
if (tor_tls_context_init(public_server_mode(options), if (tor_tls_context_init(public_server_mode(options),
get_client_identity_key(), get_tlsclient_identity_key(),
is_server ? get_server_identity_key() : NULL, is_server ? get_server_identity_key() : NULL,
MAX_SSL_KEY_LIFETIME) < 0) { MAX_SSL_KEY_LIFETIME) < 0) {
log_warn(LD_BUG, "Error reinitializing TLS context"); log_warn(LD_BUG, "Error reinitializing TLS context");

10
src/or/router.c
View File

@ -163,11 +163,11 @@ set_client_identity_key(crypto_pk_env_t *k)
client_identitykey = k; client_identitykey = k;
} }
/** Returns the current client identity key; requires that the key has /** Returns the current client identity key for use on outgoing TLS
* been set. * connections; requires that the key has been set.
*/ */
crypto_pk_env_t * crypto_pk_env_t *
get_client_identity_key(void) get_tlsclient_identity_key(void)
{ {
tor_assert(client_identitykey); tor_assert(client_identitykey);
return client_identitykey; return client_identitykey;
@ -503,7 +503,7 @@ init_keys(void)
set_client_identity_key(prkey); set_client_identity_key(prkey);
/* Create a TLS context. */ /* Create a TLS context. */
if (tor_tls_context_init(0, if (tor_tls_context_init(0,
get_client_identity_key(), get_tlsclient_identity_key(),
NULL, NULL,
MAX_SSL_KEY_LIFETIME) < 0) { MAX_SSL_KEY_LIFETIME) < 0) {
log_err(LD_GENERAL,"Error creating TLS context for Tor client."); log_err(LD_GENERAL,"Error creating TLS context for Tor client.");
@ -599,7 +599,7 @@ init_keys(void)
/* 3. Initialize link key and TLS context. */ /* 3. Initialize link key and TLS context. */
if (tor_tls_context_init(public_server_mode(options), if (tor_tls_context_init(public_server_mode(options),
get_client_identity_key(), get_tlsclient_identity_key(),
get_server_identity_key(), get_server_identity_key(),
MAX_SSL_KEY_LIFETIME) < 0) { MAX_SSL_KEY_LIFETIME) < 0) {
log_err(LD_GENERAL,"Error initializing TLS context"); log_err(LD_GENERAL,"Error initializing TLS context");

2
src/or/router.h
View File

@ -18,7 +18,7 @@ void set_server_identity_key(crypto_pk_env_t *k);
crypto_pk_env_t *get_server_identity_key(void); crypto_pk_env_t *get_server_identity_key(void);
int server_identity_key_is_set(void); int server_identity_key_is_set(void);
void set_client_identity_key(crypto_pk_env_t *k); void set_client_identity_key(crypto_pk_env_t *k);
crypto_pk_env_t *get_client_identity_key(void); crypto_pk_env_t *get_tlsclient_identity_key(void);
int client_identity_key_is_set(void); int client_identity_key_is_set(void);
authority_cert_t *get_my_v3_authority_cert(void); authority_cert_t *get_my_v3_authority_cert(void);
crypto_pk_env_t *get_my_v3_authority_signing_key(void); crypto_pk_env_t *get_my_v3_authority_signing_key(void);