torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson
2010-12-03 13:45:10 -05:00
parent 0bd884cd5b c0f1517d87
commit 0893793f01
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug2235
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes
- Avoid crashes when AccountingMax is set on clients. Fixes bug 2235;
Bugfix on 0.2.2.18-alpha. Diagnosed by boboper.
src/or/hibernate.c
+12 -7
View File
@@ -529,14 +529,19 @@ accounting_set_wakeup_time(void)
}
}
format_iso_time(buf, interval_start_time);
crypto_pk_get_digest(get_server_identity_key(), digest);
if (server_identity_key_is_set()) {
format_iso_time(buf, interval_start_time);
d_env = crypto_new_digest_env();
crypto_digest_add_bytes(d_env, buf, ISO_TIME_LEN);
crypto_digest_add_bytes(d_env, digest, DIGEST_LEN);
crypto_digest_get_digest(d_env, digest, DIGEST_LEN);
crypto_free_digest_env(d_env);
crypto_pk_get_digest(get_server_identity_key(), digest);
d_env = crypto_new_digest_env();
crypto_digest_add_bytes(d_env, buf, ISO_TIME_LEN);
crypto_digest_add_bytes(d_env, digest, DIGEST_LEN);
crypto_digest_get_digest(d_env, digest, DIGEST_LEN);
crypto_free_digest_env(d_env);
} else {
crypto_rand(digest, DIGEST_LEN);
}
if (!expected_bandwidth_usage) {
char buf1[ISO_TIME_LEN+1];