aboutsummaryrefslogtreecommitdiff
path: root/src/common
AgeCommit message (Collapse)Author
2015-01-13Merge remote-tracking branch 'andrea/ticket12585_v3'Nick Mathewson
2015-01-12Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'Nick Mathewson
2015-01-12src/common/compat_libevent.h: include testsupport.hAnthony G. Basile
When tor is configured with --enable-bufferevents, the build fails because compat_libevent.h makes use of the macro MOCK_DECL() which is defined in testsupport.h, but not included. We add the include.
2015-01-10Fix tortls.c build with GCC<4.6Nick Mathewson
apparantly, "pragma GCC diagnostic push/pop" don't exist with older versions. Fixes bug in 740e592790f570c446cbb5e6d4a77f842f75; bug not in any released Tor.
2015-01-10Ignore warning for redundant decl in openssl/srtp.hNick Mathewson
2015-01-10Merge remote-tracking branch 'teor/fix-typos'Nick Mathewson
2015-01-10Merge branch 'master' of https://git.torproject.org/tor into ↵teor
bug13111-empty-key-files-fn-empty Conflicts: src/or/connection_edge.c Merged in favour of origin.
2015-01-10Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-emptyteor
Conflicts: src/or/router.c Choose newer comment. Merge changes to comment and function invocation.
2015-01-10Fix a minor misspelling in util.cteor
2015-01-07Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585.Jacob Appelbaum
Signed-off-by: Andrea Shepard <andrea@torproject.org>
2015-01-07Merge remote-tracking branch 'public/bug12985_025'Nick Mathewson
2015-01-07Merge branch 'bug9286_v3_squashed'Nick Mathewson
2015-01-07Stop accepting milliseconds in various directory contextsNick Mathewson
Have clients and authorities both have new behavior, since the fix for bug 11243 has gone in. But make clients still accept accept old bogus HSDir descriptors, to avoid fingerprinting trickery. Fixes bug 9286.
2015-01-06Merge remote-tracking branch 'public/feature11791'Nick Mathewson
2015-01-02Bump copyright dates to 2015, in case someday this matters.Nick Mathewson
2014-12-30Fix a memory leak in tor-resolveNick Mathewson
Resolves bug 14050
2014-12-30Remove a logically dead check to please coverityNick Mathewson
2014-12-29Wipe all of the target space in tor_addr_{to,from}_sockaddr()Nick Mathewson
Otherwise we risk a subsequent memdup or memcpy copying uninitialized RAM into some other place that might eventually expose it. Let's make sure that doesn't happen. Closes ticket 14041
2014-12-29Merge branch 'resolvemyaddr_squashed'Nick Mathewson
2014-12-29Adding comprehensive test cases for resolve_my_address.rl1987
Also, improve comments on resolve_my_address to explain what it actually does.
2014-12-29Fix a few commentsrl1987
2014-12-23tweak whitespace; log bad socket family if bug occursNick Mathewson
2014-12-23Add the transparent proxy getsockopt to the sandboxFrancisco Blas Izquierdo Riera (klondike)
When receiving a trasnsparently proxied request with tor using iptables tor dies because the appropriate getsockopt calls aren't enabled on the sandbox. This patch fixes this by adding the two getsockopt calls used when doing transparent proxying with tor to the sandbox for the getsockopt policy. This patch is released under the same license as the original file as long as the author is credited. Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
2014-12-22Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-12-22Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5Nick Mathewson
2014-12-22When decoding a base-{16,32,64} value, clear the target buffer firstNick Mathewson
This is a good idea in case the caller stupidly doesn't check the return value from baseX_decode(), and as a workaround for the current inconsistent API of base16_decode. Prevents any fallout from bug 14013.
2014-12-21Make log bufer 10k, not 9.78k.teor
2014-12-21Fix a comment in tor_addr_parseteor
2014-12-20Fix clang warning, IPv6 address comment, buffer size typoteor
The address of an array in the middle of a structure will always be non-NULL. clang recognises this and complains. Disable the tautologous and redundant check to silence this warning. A comment about an IPv6 address string incorrectly refers to an IPv4 address format. A log buffer is sized 10024 rather than 10240. Fixes bug 14001.
2014-12-19Define an int64_min when it is missingNick Mathewson
2014-12-10Add better support to obfuscate statistics.Karsten Loesing
2014-12-02Constify crypto_pk_get_digest().George Kadianakis
2014-11-27Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'Nick Mathewson
Conflicts: src/or/or.h src/test/Makefile.nmake
2014-11-17Use smaller zlib objects when under memory pressureNick Mathewson
We add a compression level argument to tor_zlib_new, and use it to determine how much memory to allocate for the zlib object. We use the existing level by default, but shift to smaller levels for small requests when we have been over 3/4 of our memory usage in the past half-hour. Closes ticket 11791.
2014-11-12Merge remote-tracking branch 'public/bug7484'Nick Mathewson
Conflicts: src/test/test_addr.c
2014-11-12Replace operators used as macro arguments with OP_XX macrosNick Mathewson
Part of fix for 13172
2014-11-12Merge branch 'ticket13172'Nick Mathewson
2014-11-09Downgrade RSA signature verification failure error message to info loglevel.rl1987
2014-11-08Stop failing when key files are zero-lengthteor
Instead, generate new keys, and overwrite the empty key files. Adds FN_EMPTY to file_status_t and file_status. Fixes bug 13111. Related changes due to review of FN_FILE usage: Stop generating a fresh .old RSA key file when the .old file is missing. Avoid overwriting .old key files with empty key files. Skip loading zero-length extra info store, router store, stats, state, and key files.
2014-11-08Stop crashing when a NULL filename is passed to file_status()teor
Stop crashing when a NULL filename is passed to file_status(), instead, return FN_ERROR. Also return FN_ERROR when a zero-length filename is passed to file_status(). Fixed as part of bug 13111.
2014-11-06Define macros meaning <,>,==,!=,<=,>=Nick Mathewson
This lets us avoid putting operators directly in macro arguments, and thus will help us unconfuse coccinelle. For ticket 13172.
2014-11-0511291: Fix warnings, add changes file, rename 'mask'.Nick Mathewson
2014-11-05Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'Nick Mathewson
Conflicts: src/or/config.c
2014-11-04Merge branch 'bug13315_squashed'Nick Mathewson
Conflicts: src/or/buffers.c
2014-11-04fix indentationNick Mathewson
2014-11-04Use correct argument types for inet_pton.Nick Mathewson
(I blame whoever decided that using a void* for a union was a good idea.)
2014-11-04Checking if FQDN is actually IPv6 address string and handling that case.rl1987
2014-11-04Adding helper function that checks if string is a valid IPv6 address.rl1987
2014-11-04Introducing helper function to validate IPv4 address strings.rl1987
2014-11-04Introducing helper function to validate DNS name strings.rl1987