Nick Mathewson
649104fdb9
Remove a needless memwipe.
...
The interior of ctx here is already wiped by
crypto_digest_free(). This memwipe call only wiped the pointer
itself, which isn't sensitive.
2017-08-08 19:58:19 -04:00
Nick Mathewson
b08a2dc954
Merge branch 'maint-0.3.1'
2017-08-08 19:29:10 -04:00
Nick Mathewson
a47b8fcf92
Merge branch 'bug23139' into maint-0.3.1
2017-08-08 19:29:05 -04:00
Nick Mathewson
48a57f9815
Merge branch 'maint-0.3.1'
2017-08-08 10:10:52 -04:00
Nick Mathewson
7465ea4ad9
Remove some LCOV_EXCL stuff that I think may be testable after all.
...
This is partial revert on 22286.
Also, tweak some log messages to be distinct.
2017-08-08 10:08:06 -04:00
Nick Mathewson
6121ca16bc
Merge remote-tracking branch 'ahf/bugs/22286' into maint-0.3.1
2017-08-08 10:03:08 -04:00
Nick Mathewson
3af4aafbcb
Fix a memory leak in consdiffmgr.c
...
Fixes bug 23139; bugfix on 0.3.1.1-alpha.
2017-08-08 09:13:45 -04:00
Roger Dingledine
2032b9b1b1
fix typo in comment
2017-08-07 00:22:27 -04:00
Nick Mathewson
ce07b4dd91
Fix memory leak of "torrcd" in test_config_include_folder_order()
...
Bugfix on 0265ced02b7a652c5941cb2c14ee1e0de0b1d90e; bug not in any
released Tor.
2017-08-04 13:50:27 -04:00
Nick Mathewson
89407bedf8
Tweak usage of get_current_working_dir() for tor_malloc() paranoia.
...
We assume that tor_free() is not required to be compatible with
the platform malloc(), so we need to use a strdup here.
2017-08-04 12:26:35 -04:00
cypherpunks
bfe740f065
Refactor retrieving the current working directory
...
The GNU C Library (glibc) offers an function which allocates the
necessary memory automatically [0]. When it is available, we use that.
Otherwise we depend upon the `getcwd` function which requires a
preallocated buffer (and its size). This function was used incorrectly
by depending on the initial buffer size being big enough and otherwise
failing to return the current working directory. The proper way of
getting the current working directory requires a loop which doubles the
buffer size if `getcwd` requires it. This code was copied from [1] with
modifications to fit the context.
[0] https://www.gnu.org/software/hurd/hurd/porting/guidelines.html
[1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html
2017-08-04 12:22:53 -04:00
cypherpunks
0265ced02b
Remove usage of the PATH_MAX variable
...
GNU Hurd does not define the PATH_MAX variable. Using the variable on
this platform results in compilation errors.
Closes #23098 .
2017-08-04 12:22:53 -04:00
Nick Mathewson
32b4fd5be9
Handle CMD_KEY_EXPIRATION in ntmain.c switch statement
...
This fixes a compilation warning on windows.
Bug not in any released Tor.
2017-08-04 12:00:51 -04:00
Isis Lovecruft
b2a7e8df90
routerkeys: Add cmdline option for learning signing key expiration.
...
* CLOSES #17639 .
* ADDS new --key-expiration commandline option which prints when the
signing key expires.
2017-08-03 22:20:02 +00:00
Nick Mathewson
96cf608b2e
Merge branch 'bug22885_squashed'
2017-08-03 09:33:40 -04:00
Nick Mathewson
7f32920648
Don't send missing X-Desc-Gen-Reason on startup
...
Since we start with desc_clean_since = 0, we should have been
starting with non-null desc_dirty_reason.
Fixes bug 22884; bugfix on 0.2.3.4-alpha when X-Desc-Gen-Reason was
added.
2017-08-03 09:33:33 -04:00
Nick Mathewson
1168e21b45
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 09:14:12 -04:00
Nick Mathewson
40c7871f46
Merge branch 'maint-0.3.1'
2017-08-03 09:14:12 -04:00
Nick Mathewson
b548371f76
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
2017-08-03 09:12:23 -04:00
Nick Mathewson
17073d7234
Merge branch 'maint-0.3.1'
2017-08-03 09:11:03 -04:00
Nick Mathewson
b13bf65062
Merge branch 'bug23081_025' into maint-0.3.1
2017-08-03 09:10:58 -04:00
Nick Mathewson
3e68db02c4
In ntmain, call set_main_thread() before running the loop.
...
Patch from Vort; fixes bug 23081; bugfix on fd992deeea
in
0.2.1.16-rc when set_main_thread() was introduced.
See the changes file for a list of all the symptoms this bug has
been causing when running Tor as a Windows Service.
2017-08-03 09:09:08 -04:00
Neel Chauhan
5ee6ca8da2
Switch to offsetof()
2017-08-03 08:56:35 -04:00
Nick Mathewson
02fcb29d11
Merge branch 'maint-0.3.1'
2017-08-03 08:44:32 -04:00
Nick Mathewson
f33c96610f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-03 08:44:31 -04:00
Nick Mathewson
e220e6e437
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 08:44:31 -04:00
Nick Mathewson
9696021593
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-03 08:44:31 -04:00
Nick Mathewson
93b28972c1
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-08-03 08:44:31 -04:00
Karsten Loesing
1280de42a4
Update geoip and geoip6 to the August 3 2017 database.
2017-08-03 10:00:54 +02:00
Nick Mathewson
c4c5077af2
Merge branch 'maint-0.3.1'
2017-08-02 12:51:46 -04:00
Nick Mathewson
a9a8d53dec
Merge branch 'bug23071_031' into maint-0.3.1
2017-08-02 12:51:42 -04:00
Nick Mathewson
ee849ee8b6
Make the hs_ntor_ref logic more correct when there is no sha3 module
2017-08-02 12:44:46 -04:00
Nick Mathewson
8925e84beb
version bump to 0.3.0.10-dev
2017-08-02 12:28:34 -04:00
Nick Mathewson
4f7955d5de
Bump to 0.3.0.10
2017-08-01 14:38:49 -04:00
David Goulet
ff9c529667
hs: Cleanup logging statement in hs_intropoint.c
...
One log statement was a warning and has been forgotten. It is triggered for a
successful attempt at introducting from a client.
It has been reported here:
https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html
Three other log_warn() statement changed to protocol warning because they are
errors that basically can come from the network and thus triggered by anyone.
Fixes #23078 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-01 14:15:47 -04:00
Nick Mathewson
9c294d29ea
bump to 0.3.1.5-alpha-dev
2017-08-01 12:08:30 -04:00
Nick Mathewson
58e1c6dd86
Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9
2017-08-01 11:30:29 -04:00
Nick Mathewson
8500f0e4e1
Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
2017-08-01 11:28:36 -04:00
Nick Mathewson
84c4a2bc3f
Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
2017-08-01 11:24:02 -04:00
Nick Mathewson
7c68b2f1a5
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:23:00 -04:00
Nick Mathewson
2b94b0ea72
Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
2017-08-01 11:22:42 -04:00
Nick Mathewson
1d48712c28
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:21:19 -04:00
Nick Mathewson
f6ecda8400
Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9
2017-08-01 11:21:14 -04:00
Nick Mathewson
4a19498edc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:19:30 -04:00
Nick Mathewson
64e5600103
Merge branch 'maint-0.3.1'
2017-08-01 11:19:30 -04:00
Nick Mathewson
9d24a352c0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:19:30 -04:00
Nick Mathewson
0e7558ab64
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-08-01 11:19:29 -04:00
Nick Mathewson
925ef048a9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-01 11:19:29 -04:00
Nick Mathewson
a48ae2aa67
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-08-01 11:19:29 -04:00
Nick Mathewson
6862eada65
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-08-01 11:19:29 -04:00