Nick Mathewson
6a08bcf530
Merge remote-tracking branch 'public/ticket16543'
2015-07-16 15:47:00 -04:00
Nick Mathewson
2ba6542517
Merge remote-tracking branch 'sysrqb/bug15220_026_sysrqb'
2015-07-16 15:38:08 -04:00
Nick Mathewson
90701c1de4
Add my script to dump per-file or per-function coverage
2015-07-16 11:55:44 -04:00
Nick Mathewson
edaf681735
Break some wide lines
2015-07-16 11:11:21 -04:00
Nick Mathewson
b5cfcb2045
Fix most check-spaces issues
2015-07-16 11:10:14 -04:00
Nick Mathewson
8cb5070376
Use C99 variadic macros when not on GCC.
...
1) We already require C99.
2) This allows us to support MSVC again (thanks to Gisle Vanem for
this part)
3) This change allows us to dump some rotten old compatibility code
from log.c
2015-07-15 14:43:35 -04:00
Nick Mathewson
7bd5212ddc
Merge branches 'feature_16582' and 'feature_16581'
2015-07-15 11:05:33 -04:00
Nick Mathewson
c4ab8f74da
Don't allow INIT_ED_KEY_{NO_REPAIR,NEEDCERT} to be used together.
...
We haven't implemented NO_REPAIR for NEEDCERT, and we don't need it:
but it's safest to stop any attempt to use it that way.
2015-07-15 10:45:40 -04:00
Nick Mathewson
3c28d95ca7
Add more EINVAL errno setting on key read failures
...
Teor found these. This is for part of #16582 .
2015-07-15 10:35:29 -04:00
Nick Mathewson
d2cb923320
Remove tor-fw-helper code
...
It did a good idea, but the code-quality of libupnpc and libnatpnp
is so dodgy that I'm not really comfortable including them alongside
Tor proper. Instead, we'll recommend that people do the pure-go
reimplementation instead. Closes ticket 13338.
2015-07-14 14:48:22 -04:00
Nick Mathewson
a65e835800
Add changes file for 8712; apply it to HSDir flag as well.
2015-07-14 14:03:30 -04:00
Peter Retzlaff
fa788a54f5
Vote for relays to be fast and stable even when they aren't currently active.
2015-07-14 13:59:29 -04:00
Nick Mathewson
8596ccce01
Change the name for the keypinning file; delete the old one if found
...
This is a brute-force fix for #16580 , wherein #16530 caused some
routers to do bad things with the old keypinning journal.
2015-07-14 11:33:35 -04:00
Nick Mathewson
3fcb74e98b
Add more consistency checks in load_ed_keys
...
Make sure that signing certs are signed by the right identity key,
to prevent a recurrence of #16530 . Also make sure that the master
identity key we find on disk matches the one we have in RAM, if we
have one.
This is for #16581 .
2015-07-14 11:27:49 -04:00
Nick Mathewson
1360326588
Do more consistency checks in ed_key_init_from_file()
...
When there is a signing key and the certificate lists a key, make
sure that the certificate lists the same signing key.
When there are public key and secret key stored in separate files,
make sure they match.
Use the right file name when we load an encrypted secret key and
then find a problem with it.
This is part of 16581.
2015-07-14 11:12:18 -04:00
Nick Mathewson
5e8edba3d8
If loading an ed25519 master key fails with errno != ENOENT, give up.
...
This implements feature 16582: if we get EMFILE or something when
loading our master key, we should not at that point attempt to
overwrite it.
2015-07-14 10:36:39 -04:00
Nick Mathewson
0a6997d78b
Preserve errno when loading encrypted ed25519 keys.
2015-07-14 10:23:07 -04:00
Nick Mathewson
b566cb9e84
Make file-reading and key-reading preserve errno
...
This is an important part of #16582 .
2015-07-14 10:18:52 -04:00
John Brooks
e03eaa3c4a
Remove empty rend_service_validate_intro_early function
2015-07-14 02:30:04 -04:00
John Brooks
cdc5debfde
Rename ambiguous introduction point functions
...
Task #15824
2015-07-14 02:29:17 -04:00
Nick Mathewson
b06759edfd
Try to convince coverity not to worry about this loop either
2015-07-12 17:01:17 -04:00
Nick Mathewson
7892aff3a8
Try to convince coverity not to worryh about this loop
2015-07-12 17:00:45 -04:00
Nick Mathewson
920c63877c
Tell coverity to tolerate ed25519_verify
2015-07-12 16:59:37 -04:00
Nick Mathewson
eb4604c35a
Merge remote-tracking branch 'origin/maint-0.2.6'
...
This is an 'ours' merge, to avoid taking the bump to 0.2.6.10-dev
2015-07-12 16:37:59 -04:00
Nick Mathewson
9d1801b4b9
Bump maint-0.2.6 to 0.2.6.10-dev
2015-07-12 16:37:20 -04:00
Nick Mathewson
062497f9e7
Forward-port the changelog and releasenotes
2015-07-12 16:34:30 -04:00
Nick Mathewson
19f9803f8e
Okay, this time it was my fault
2015-07-12 15:44:43 -04:00
Nick Mathewson
58cd21f601
Fine, mingw! fine! are you happy now??
2015-07-12 15:30:35 -04:00
Nick Mathewson
7ed477786c
This should be the last SecureZeroMemory fix
2015-07-12 15:14:52 -04:00
Nick Mathewson
9f21c85e04
Dammit, autoconf!
2015-07-12 15:02:43 -04:00
Nick Mathewson
d835264690
Disable -Wstack-protector diagnostics in curve25519-donna-helpers.h
...
This was causing a false positive on our arm builders.
2015-07-12 14:48:48 -04:00
Nick Mathewson
db88d91ebe
Nth time is maybe the charm for fixing windows readpassword build errors
2015-07-12 14:34:11 -04:00
Nick Mathewson
6b80ff1b45
Merge remote-tracking branch 'origin/maint-0.2.6'
...
This is an "ours" merge to avoid bumping the version number in master.
2015-07-12 13:34:22 -04:00
Nick Mathewson
3d0c09019f
Bump maint-0.2.6 to 0.2.6.10
2015-07-12 13:33:47 -04:00
Nick Mathewson
de397d57c9
note some dead code in set_max_file_descriptors
2015-07-11 16:53:32 -04:00
Nick Mathewson
8507d75c82
Fix a leak in test_microdesc (CID 1311631)
2015-07-11 16:47:25 -04:00
Nick Mathewson
d18215ed16
Try one more one more time to get tor-ci-windows working
...
Apparently its mingw headers are missing some stuff.
2015-07-10 09:59:29 -04:00
Nick Mathewson
ad0d181854
Attempt yet again to make the tor-ci-windows builder happy
2015-07-10 09:16:32 -04:00
Nick Mathewson
2f8cf524ba
Remove the HidServDirV2 and VoteOnHidServDirectoriesV2 options
...
(Mark them as obsolete)
Closes 16543.
2015-07-10 09:05:26 -04:00
Nick Mathewson
fdf5014d11
Fix missing-macro errors
2015-07-09 16:34:51 -04:00
Nick Mathewson
0ca98c1ee5
Merge branch 'libscrypt_eq_openssl_squashed'
2015-07-09 16:31:42 -04:00
rl1987
a13d0fd342
Adding changes file for 16189.
2015-07-09 16:31:22 -04:00
rl1987
5c86708e4d
Assert interoperability betweeen libscrypt and OpenSSL EBP_PBE_scrypt().
...
Add a new and slow unit test that checks if libscrypt_scrypt() and
EBP_PBE_scrypt() yield the same keys from test vectors.
squash! Assert interoperability betweeen libscrypt and OpenSSL EBP_PBE_scrypt().
squash! Assert interoperability betweeen libscrypt and OpenSSL EBP_PBE_scrypt().
squash! Assert interoperability betweeen libscrypt and OpenSSL EBP_PBE_scrypt().
2015-07-09 16:31:19 -04:00
Nick Mathewson
4438b2a0e3
More windows header stuff. Will it work this time?
2015-07-09 14:58:16 -04:00
Nick Mathewson
f19a75e19b
Fix dumb windows compilation bug in d9052c62
2015-07-09 13:36:27 -04:00
Nick Mathewson
3301b7a1af
Repair make dist-check
2015-07-09 13:04:53 -04:00
Nick Mathewson
a6a0759e3a
Merge remote-tracking branch 'yawning/feature16467_9663'
2015-07-09 12:53:55 -04:00
Nick Mathewson
327efe9190
Merge branch 'bug4862_027_04_squashed'
2015-07-09 12:05:14 -04:00
David Goulet
5fa280f7ad
Fix comments in rendservice.c
...
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-07-09 12:02:12 -04:00
David Goulet
7657194d77
Count intro circuit and not only established ones
...
When cleaning up extra circuits that we've opened for performance reason, we
need to count all the introduction circuit and not only the established ones
else we can end up with too many introduction points.
This also adds the check for expiring nodes when serving an INTRODUCE cell
since it's possible old clients are still using them before we have time to
close them.
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-07-09 12:02:12 -04:00