nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/ticket18319'

Browse Source
This commit is contained in:
Nick Mathewson 2017-01-21 14:44:00 -05:00
commit e52f49aa80
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket18319 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (directory authority, security):
- The default for AuthDirPinKeys is now 1: directory authorities will
reject relays where the RSA identity key matches a previously seen
value, but the Ed25519 key has changed. Closes ticket 18319.

2
doc/tor.1.txt
View File

@ -2277,7 +2277,7 @@ on the public Tor network.
publish a descriptor if any other relay has reserved its <Ed25519,RSA> publish a descriptor if any other relay has reserved its <Ed25519,RSA>
identity keypair. In all cases, Tor records every keypair it accepts identity keypair. In all cases, Tor records every keypair it accepts
in a journal if it is new, or if it differs from the most recently in a journal if it is new, or if it differs from the most recently
accepted pinning for one of the keys it contains. (Default: 0) accepted pinning for one of the keys it contains. (Default: 1)
[[AuthDirSharedRandomness]] **AuthDirSharedRandomness** **0**|**1**:: [[AuthDirSharedRandomness]] **AuthDirSharedRandomness** **0**|**1**::
Authoritative directories only. Switch for the shared random protocol. Authoritative directories only. Switch for the shared random protocol.

2
src/or/config.c
View File

@ -212,7 +212,7 @@ static config_var_t option_vars_[] = {
V(AuthDirInvalidCCs, CSV, ""), V(AuthDirInvalidCCs, CSV, ""),
V(AuthDirFastGuarantee, MEMUNIT, "100 KB"), V(AuthDirFastGuarantee, MEMUNIT, "100 KB"),
V(AuthDirGuardBWGuarantee, MEMUNIT, "2 MB"), V(AuthDirGuardBWGuarantee, MEMUNIT, "2 MB"),
V(AuthDirPinKeys, BOOL, "0"), V(AuthDirPinKeys, BOOL, "1"),
V(AuthDirReject, LINELIST, NULL), V(AuthDirReject, LINELIST, NULL),
V(AuthDirRejectCCs, CSV, ""), V(AuthDirRejectCCs, CSV, ""),
OBSOLETE("AuthDirRejectUnlisted"), OBSOLETE("AuthDirRejectUnlisted"),