diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-06-07 06:10:54 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-06-07 06:10:54 +0000 |
| commit | 0bfef523dfe4c4dc83ba2a444045c118ca5ac2b6 (patch) | |
| tree | ce30032e0b108f09f5030e10801be06952759065 /src/or | |
| parent | 7512be0b650198b074345b562dbe0c4edc74653a (diff) | |
| download | tor-0bfef523dfe4c4dc83ba2a444045c118ca5ac2b6.tar tor-0bfef523dfe4c4dc83ba2a444045c118ca5ac2b6.tar.gz | |
simplify the tortls api: we only support being a "server", that
is, even tor clients do the same sort of handshake.
this has been true for years, so it's best to get rid of the
stale code.
svn:r6557
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 2 | ||||
| -rw-r--r-- | src/or/router.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c index 2ff5d5e27..03173ca04 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -757,7 +757,7 @@ run_scheduled_events(time_t now) last_rotated_certificate = now; if (last_rotated_certificate+MAX_SSL_KEY_LIFETIME < now) { log_info(LD_GENERAL,"Rotating tls context."); - if (tor_tls_context_new(get_identity_key(), 1, options->Nickname, + if (tor_tls_context_new(get_identity_key(), options->Nickname, MAX_SSL_KEY_LIFETIME) < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? */ diff --git a/src/or/router.c b/src/or/router.c index d9186adc1..ee4cba30c 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -260,7 +260,7 @@ init_keys(void) return -1; set_identity_key(prkey); /* Create a TLS context; default the client nickname to "client". */ - if (tor_tls_context_new(get_identity_key(), 1, + if (tor_tls_context_new(get_identity_key(), options->Nickname ? options->Nickname : "client", MAX_SSL_KEY_LIFETIME) < 0) { log_err(LD_GENERAL,"Error creating TLS context for OP."); @@ -302,7 +302,7 @@ init_keys(void) } /* 3. Initialize link key and TLS context. */ - if (tor_tls_context_new(get_identity_key(), 1, options->Nickname, + if (tor_tls_context_new(get_identity_key(), options->Nickname, MAX_SSL_KEY_LIFETIME) < 0) { log_err(LD_GENERAL,"Error initializing TLS context"); return -1; |