Commit 2a2301e4 authored by Nick Mathewson's avatar Nick Mathewson 🦀 Committed by Sebastian Hahn
Browse files

Rename get_client_identity_key to get_tlsclient_identity_key

parent 59e565e2

src/or/connection_or.c

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn, 
    started_here ? conn->_base.address : safe_str(conn->_base.address);

  const char *conn_type = started_here ? "outgoing" : "incoming";

  crypto_pk_env_t *our_identity =

    started_here ? get_client_identity_key() :

    started_here ? get_tlsclient_identity_key() :

                   get_server_identity_key();

  int has_cert = 0, has_identity=0;

src/or/main.c

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ run_scheduled_events(time_t now) 
  if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) {

    log_info(LD_GENERAL,"Rotating tls context.");

    if (tor_tls_context_init(public_server_mode(options),

                             get_client_identity_key(),

                             get_tlsclient_identity_key(),

                             is_server ? get_server_identity_key() : NULL,

                             MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {

      log_warn(LD_BUG, "Error reinitializing TLS context");

src/or/or.h

+1 −1
Original line number Diff line number Diff line
@@ -4207,7 +4207,7 @@ crypto_pk_env_t *get_onion_key(void); 
time_t get_onion_key_set_at(void);

void set_client_identity_key(crypto_pk_env_t *k);

void set_server_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);

crypto_pk_env_t *get_server_identity_key(void);

int client_identity_key_is_set(void);

int server_identity_key_is_set(void);

src/or/router.c

+5 −5
Original line number Diff line number Diff line
@@ -148,11 +148,11 @@ set_client_identity_key(crypto_pk_env_t *k) 
  client_identitykey = k;

}



/** Returns the current client identity key; requires that the key has

 * been set.

/** Returns the current client identity key for use on outgoing TLS

 * connections; requires that the key has been set.

 */

crypto_pk_env_t *

get_client_identity_key(void)

get_tlsclient_identity_key(void)

{

  tor_assert(client_identitykey);

  return client_identitykey;
@@ -490,7 +490,7 @@ init_keys(void) 
    set_client_identity_key(prkey);

    /* Create a TLS context. */

    if (tor_tls_context_init(0,

                             get_client_identity_key(),

                             get_tlsclient_identity_key(),

                             NULL,

                             MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {

      log_err(LD_GENERAL,"Error creating TLS context for Tor client.");
@@ -586,7 +586,7 @@ init_keys(void) 


  /* 3. Initialize link key and TLS context. */

  if (tor_tls_context_init(public_server_mode(options),

                           get_client_identity_key(),

                           get_tlsclient_identity_key(),

                           get_server_identity_key(),

                           MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {

    log_err(LD_GENERAL,"Error initializing TLS context");