Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'asn2/bug3336' | Nick Mathewson | 2011-06-06 |
|\ | |||
| * | Add the heartbeat domain in log.c:domain_list[] | George Kadianakis | 2011-06-05 |
| | | | | | | | | so that parse_log_domain() doesn't fail. | ||
* | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-06-06 |
|\ \ | |||
| * | | Check maximum properly in crypto_rand_int() | Nick Mathewson | 2011-06-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | George Kadianakis notes that if you give crypto_rand_int() a value above INT_MAX, it can return a negative number, which is not what the documentation would imply. The simple solution is to assert that the input is in [1,INT_MAX+1]. If in the future we need a random-value function that can return values up to UINT_MAX, we can add one. Fixes bug 3306; bugfix on 0.2.2pre14. | ||
* | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-06-03 |
|\| | | |||
| * | | Reject 128-byte keys that are not 1024-bit | Nick Mathewson | 2011-06-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we added the check for key size, we required that the keys be 128 bytes. But RSA_size (which defers to BN_num_bytes) will return 128 for keys of length 1017..1024. This patch adds a new crypto_pk_num_bits() that returns the actual number of significant bits in the modulus, and uses that to enforce key sizes. Also, credit the original bug3318 in the changes file. | ||
* | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-06-01 |
|\| | | |||
| * | | Fix compile error in procmon.c | Gisle | 2011-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | An elusive compile-error (MingW-gcc v4.50 on Win_XP); a missing comma (!) and a typo ('err_msg' at line 277 changed to 'errmsg'). Aso changed the format for 'err_code' at line 293 into a "%ld" to suppress a warning. How did this go unnoticed for ~1 month? Btw. This is my 1st ever 'git commit', so it better work. | ||
* | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-30 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conflicts were mainly caused by the routerinfo->node transition. Conflicts: src/or/circuitbuild.c src/or/command.c src/or/connection_edge.c src/or/directory.c src/or/dirserv.c src/or/relay.c src/or/rendservice.c src/or/routerlist.c | ||
| * | | whitespace fixes | Nick Mathewson | 2011-05-30 |
| | | | |||
* | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-30 |
|\| | | |/ |/| | | | | | | | Conflicts: src/common/compat.c src/or/main.c | ||
| * | Merge remote-tracking branch 'public/bug3270' into maint-0.2.2 | Nick Mathewson | 2011-05-30 |
| |\ | |||
| | * | Use a 64-bit type to hold sockets on win64. | Nick Mathewson | 2011-05-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On win64, sockets are of type UINT_PTR; on win32 they're u_int; elsewhere they're int. The correct windows way to check a socket for being set is to compare it with INVALID_SOCKET; elsewhere you see if it is negative. On Libevent 2, all callbacks take sockets as evutil_socket_t; we've been passing them int. This patch should fix compilation and correctness when built for 64-bit windows. Fixes bug 3270. | ||
* | | | Fix a -Wunused-but-set-variable instance in master | Nick Mathewson | 2011-05-28 |
| | | | |||
* | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-23 |
|\| | | |||
| * | | Unbreak the build on libevent 1.x systems | Robert Ransom | 2011-05-22 |
| | | | |||
* | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-23 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/common/Makefile.am src/or/control.c | ||
| * | | Merge branch 'feature3049-v2' into maint-0.2.2 | Nick Mathewson | 2011-05-23 |
| |\ \ | | |/ | |/| | | | | | | | Conflicts: src/common/Makefile.am | ||
| | * | The first argument for a libevent callback should be evutil_socket_t | Nick Mathewson | 2011-05-23 |
| | | | |||
| | * | Appease make check-spaces wrt procmon.h | Nick Mathewson | 2011-05-23 |
| | | | |||
| | * | Fix some comments | Robert Ransom | 2011-05-20 |
| | | | |||
| | * | Implement __OwningControllerProcess option | Robert Ransom | 2011-05-20 |
| | | | | | | | | | | | | Implements part of feature 3049. | ||
| | * | Improve a documentation comment | Robert Ransom | 2011-05-12 |
| | | | |||
| | * | Fix comment typo | Robert Ransom | 2011-05-12 |
| | | | |||
| | * | Fix comment typo | Robert Ransom | 2011-05-10 |
| | | | |||
* | | | Merge branch 'maint-0.2.2' | Roger Dingledine | 2011-05-21 |
|\| | | |||
| * | | what's up with this trailing whitespace | Roger Dingledine | 2011-05-20 |
| | | | |||
* | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-16 |
|\| | | |||
| * | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 | Nick Mathewson | 2011-05-16 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed trivial conflict due to headers moving into their own .h files from or.h. Conflicts: src/or/or.h | ||
| | * | | squash! Add crypto_pk_check_key_public_exponent function | Nick Mathewson | 2011-05-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | Rename crypto_pk_check_key_public_exponent to crypto_pk_public_exponent_ok: it's nice to name predicates s.t. you can tell how to interpret true and false. | ||
| | * | | Add crypto_pk_check_key_public_exponent function | Robert Ransom | 2011-05-16 |
| | | | | |||
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
|\| | | | |||
| * | | | Increase the length of the buffer in smartlist_string_num_isin(). | Nick Mathewson | 2011-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was harmless, since we only used this for checking for lists of port values, but it's the principle of the thing. Fixes 3175; bugfix on 0.1.0.1-rc | ||
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
|\| | | | |||
| * | | | Make check_private_dir check for group ownership as appropriate | Nick Mathewson | 2011-05-15 |
| | | | | |||
| * | | | Fix up some comment issues spotted by rransom | Nick Mathewson | 2011-05-15 |
| | | | | |||
| * | | | Add a new flag to check_private_dir to make it _not_ change permissions | Nick Mathewson | 2011-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | We'll need this for checking permissions on the directories that hold control sockets: if somebody says "ControlSocket ~/foo", it would be pretty rude to do a chmod 700 on their homedir. | ||
| * | | | Add a function to pull off the final component of a path | Nick Mathewson | 2011-05-15 |
| | | | | |||
| * | | | Make check_private_dir accept g+rx dirs if told to do so. | Nick Mathewson | 2011-05-15 |
| | | | | |||
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
|\| | | | |||
| * | | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 | Nick Mathewson | 2011-05-15 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/or/networkstatus.c | ||
| | * | | Fixup whitespace issues from 3122 commit | Nick Mathewson | 2011-05-15 |
| | | | | |||
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
|\| | | | |||
| * | | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 | Nick Mathewson | 2011-05-15 |
| |\| | | |||
| | * | | Another doc tweak on tor_memcmp: <b>b</b>, not <b>. | Nick Mathewson | 2011-05-15 |
| | | | | |||
| | * | | minor tweaks to 4b19730c8234d | Roger Dingledine | 2011-05-15 |
| | | | | |||
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/or/connection_edge.c | ||
| * | | | New smartlist function to see if two lists of strings are equal. | Nick Mathewson | 2011-05-13 |
| | | | | | | | | | | | | | | | | We'll use this to detect changes in CSV options. | ||
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-13 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c src/or/dirserv.c src/or/or.h | ||
| * | | | Add a new "tor_sockaddr_to_str()" function | Nick Mathewson | 2011-05-13 |
| | | | | | | | | | | | | | | | | | | | | It does what it says on the tin. It turns out I'll want this in a couple of places. |