diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-26 11:08:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-26 11:08:19 -0400 |
| commit | beb9097beda7cc82eec744878a2efd2810351158 (patch) | |
| tree | bf3638694718edda8b060f5dad3c35dce9f7da33 /src | |
| parent | 34f12437d42bf8cf04763e851b54d6a96470e288 (diff) | |
| parent | 4a1a89be0cd1abbd2aa4746038f52cd0dcffa65a (diff) | |
| download | tor-beb9097beda7cc82eec744878a2efd2810351158.tar.gz tor-beb9097beda7cc82eec744878a2efd2810351158.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/crypto.c | 4 | ||||
| -rw-r--r-- | src/or/main.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 0076c1d35b..0763a2c8c5 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1690,6 +1690,10 @@ crypto_digest_get_digest(crypto_digest_env_t *digest, SHA256_Final(r, &tmpenv.d.sha2); break; default: + log_warn(LD_BUG, "Called with unknown algorithm %d", digest->algorithm); + /* If fragile_assert is not enabled, then we should at least not + * leak anything. */ + memset(r, 0xff, sizeof(r)); tor_fragile_assert(); break; } diff --git a/src/or/main.c b/src/or/main.c index d01552fc16..c1a7015e68 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1689,7 +1689,8 @@ ip_address_changed(int at_interface) if (at_interface) { if (! server) { /* Okay, change our keys. */ - init_keys(); + if (init_keys()<0) + log_warn(LD_GENERAL, "Unable to rotate keys after IP change!"); } } else { if (server) { |