diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2010-10-01 14:06:57 -0700 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-10-26 14:08:36 +0200 |
| commit | 878164011108c16574d6ce1d9530fe83a3109bad (patch) | |
| tree | db7bccfc28a88d7b87fcfe1accc2f9a30231adfa /src/or/main.c | |
| parent | 07ab559a8e9932fbed1e00e3210a1bb855cf1508 (diff) | |
| download | tor-878164011108c16574d6ce1d9530fe83a3109bad.tar.gz tor-878164011108c16574d6ce1d9530fe83a3109bad.zip | |
Refactor tor_tls_context_new:
* Make tor_tls_context_new internal to tortls.c, and return the new
tor_tls_context_t from it.
* Add a public tor_tls_context_init wrapper function to replace it.
Conflicts:
src/or/main.c
src/or/router.c
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 3c879dcd0e..fe1f42ece3 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -872,8 +872,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_new(get_identity_key(), - MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { + if (tor_tls_context_init(get_identity_key(), MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } |