9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
ce149c1022
That shalt also not have a label without a statement.
2011-02-22 12:52:52 -05:00
5dbaf9dbd5
Windows has EACCES, not EACCESS
...
Once again spotted by mobmix
Also add a changes file for the fix
2011-02-11 17:02:26 +01:00
9c7e2cf010
Locking failures on windows are indicated by EACCES
...
Patch our implementation of tor_lockfile_lock() to handle this case
correctly. Also add a note that blocking behaviour differs from windows
to *nix. Fixes bug 2504, issue pointed out by mobmix.
2011-02-08 18:35:07 +01:00
0ab8b7c0f2
Thou shalt not overflow even stupidly small buffers
2011-02-04 05:50:44 -08:00
e80bdfb4a0
Correctly detect BIO_new failures
...
This bug was noticed by cypherpunks; fixes bug 2378.
Bugfix on svn commit r110.
2011-01-25 18:26:49 -05:00
bfde636aad
Always treat failure to allocate an RSA key as an unrecoverable allocation error
2011-01-25 18:19:09 -05:00
76582442a8
Handle failing cases of DH allocation
2011-01-25 18:09:38 -05:00
c939c953ae
Remove an unused function in crypto.c
2011-01-25 18:07:02 -05:00
89ee779f92
Add a torrc option to report log domains
2011-01-25 15:53:15 -05:00
e261a1a3e6
Simplify syntax for negated log domains
...
Previously if you wanted to say "All messages except network
messages", you needed to say "[*,~net]" and if you said "[~net]" by
mistake, you would get no messages at all. Now, if you say "[~net]",
you get everything except networking messages.
2011-01-25 15:03:36 -05:00
5ed73e3807
Make the DH parameter we use for TLS match the one from Apache's mod_ssl
...
Our regular DH parameters that we use for circuit and rendezvous
crypto are unchanged. This is yet another small step on the path of
protocol fingerprinting resistance.
2011-01-24 16:50:11 -05:00
a7790d48af
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-15 14:15:19 -05:00
9b09627edd
Zero out some more key data before freeing it
...
Found by cypherpunks; fixes bug 2384.
2011-01-15 14:10:52 -05:00
1393985768
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/routerparse.c
src/or/test.c
2011-01-15 13:25:13 -05:00
b97b0efec8
Merge branch 'bug2352_obsize' into maint-0.2.1
2011-01-15 13:15:06 -05:00
cff4cfef4f
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-15 12:13:50 -05:00
8f11642ceb
Merge branch 'bug2324_uncompress' into maint-0.2.1
2011-01-15 12:12:34 -05:00
1fcfc18628
clean up message; explain a magic number in a comment
2011-01-15 12:12:10 -05:00
ed87738ede
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/config.c
src/or/networkstatus.c
src/or/rendcommon.c
src/or/routerparse.c
src/or/test.c
2011-01-15 12:02:55 -05:00
115782bdbe
Fix a heap overflow found by debuger, and make it harder to make that mistake again
...
Our public key functions assumed that they were always writing into a
large enough buffer. In one case, they weren't.
(Incorporates fixes from sebastian)
2011-01-15 11:49:25 -05:00
2c04c506a4
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-12 14:38:11 -05:00
9fcc14224b
Make our replacement INT32_MAX always signed
...
The C standard says that INT32_MAX is supposed to be a signed
integer. On platforms that have it, we get the correct
platform-defined value. Our own replacement, however, was
unsigned. That's going to cause a bug somewhere eventually.
2011-01-12 14:29:38 -05:00
729f404efe
Add logic in routerparse to not read overlong private keys
...
I am not at all sure that it is possible to trigger a bug here,
but better safe than sorry.
2011-01-10 12:07:34 -05:00
240fa42aac
Fix size_t vs unsigned comparison too
2011-01-05 12:49:02 -05:00
d14b0d54d2
Fix a SIZE_T_CEILING check in torgzip.c; noticed by cypherpunks
2011-01-05 12:42:34 -05:00
0222228d64
Fix up size and sign issues in base32 code
...
Fixes bug 2331.
2011-01-03 16:16:53 -05:00
64798dab4f
Detect and disallow compression bombs
2011-01-03 15:54:23 -05:00
f089804332
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 15:31:19 -05:00
e365aee971
Avoid assertion on read_file_to_str() with size==SIZE_T_CEILING-1
...
Spotted by doors, fixes bug 2326.
2011-01-03 15:30:11 -05:00
cee433d751
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 15:15:54 -05:00
e09ab69703
Check size against SIZE_T_CEILING in realloc too.
...
Fixes bug 2324.
2011-01-03 15:15:27 -05:00
27cefef3a2
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 13:18:33 -05:00
bb5f99d4df
Merge remote branch 'sebastian/bug2314' into maint-0.2.2
2011-01-03 12:47:14 -05:00
5c09431cc7
Never include pthread.h when building for Windows.
...
On Windows, we never use pthreads, since it doesn't usually exist,
and when it does it tends to be a little weirdly-behaved. But some
mingw installations have a pthreads installed, so autoconf detects
pthread.h and tells us about it. This would make us include
pthread.h, which could make for trouble when the iffy pthread.h
tried to include config.h.
This patch changes compat.h so that we never include pthread.h on
Windows. Fixes bug 2313; bugfix on 0.1.0.1-rc.
2011-01-03 12:45:13 -05:00
30b3475e6d
Bump copyright statements to 2011 (0.2.2)
2011-01-03 11:52:09 -05:00
f1de329e78
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/common/test.h
src/or/test.c
2011-01-03 11:51:17 -05:00
1a07348a50
Bump copyright statements to 2011
2011-01-03 11:50:39 -05:00
9ecf133686
Fix compile wanrings revealed by gcc 4.5 on mingw
2010-12-27 09:47:41 +01:00
cdbd6d0fe8
Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2
2010-12-21 15:48:14 -05:00
69771bb5fc
Merge remote branch 'public/bug2190_021' into maint-0.2.1
2010-12-21 15:44:50 -05:00
b5e293afe6
Merge remote branch fix_security_bug_021 into fix_security_bug_022
...
Conflicts:
src/common/memarea.c
src/or/or.h
src/or/rendclient.c
2010-12-15 22:48:23 -05:00
b8a7bad799
Make payloads into uint8_t.
...
This will avoid some signed/unsigned assignment-related bugs.
2010-12-15 22:31:11 -05:00
785086cfba
Have all of our allocation functions and a few others check for underflow
...
It's all too easy in C to convert an unsigned value to a signed one,
which will (on all modern computers) give you a huge signed value. If
you have a size_t value of size greater than SSIZE_T_MAX, that is way
likelier to be an underflow than it is to be an actual request for
more than 2gb of memory in one go. (There's nothing in Tor that
should be trying to allocate >2gb chunks.)
2010-12-13 18:40:21 -05:00
649ee99846
Base SIZE_T_CEILING on SSIZE_T_MAX.
2010-12-13 18:40:15 -05:00
cc051f9aca
Only add each log message to pending_cb_messages once.
2010-12-11 05:26:36 -08:00
4a9d60734c
Don't call flush_pending_log_callbacks while logging LD_NOCB messages.
...
Found by boboper.
2010-12-11 04:41:35 -08:00
89e97bdf94
Add wrappers function for libc random()
...
On windows, it's called something different.
2010-11-29 16:00:47 -05:00
78df6404eb
Fix compilation with mingw and OpenSSL 0.9.8m+
2010-11-23 12:47:38 -05:00
2bd64f9e8f
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-21 14:33:11 -05:00
Nick Mathewson
Sebastian Hahn
Robert Ransom
mingw-san