diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-29 18:30:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-29 18:30:41 -0500 |
| commit | da6c136817983e30349e9733891239b05aa66f09 (patch) | |
| tree | 5c5af254f33ddfdbf8f004410f00ea131b280880 /src/or/main.c | |
| parent | 83f66db79ec6469beea0fb410be6536acb90ffd0 (diff) | |
| parent | 055d6c01fff3324dbb38c2d81ad49ccfdb5432c2 (diff) | |
| download | tor-da6c136817983e30349e9733891239b05aa66f09.tar.gz tor-da6c136817983e30349e9733891239b05aa66f09.zip | |
Merge remote-tracking branch 'asn-mytor/bug4548_take2'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/or/main.c b/src/or/main.c index abf82339b2..da45f5a681 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1189,10 +1189,7 @@ run_scheduled_events(time_t now) last_rotated_x509_certificate = 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_tlsclient_identity_key(), - is_server ? get_server_identity_key() : NULL, - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + if (router_initialize_tls_context() < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } |