torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

protover: Fix merge forward from 035

Browse Source 
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet
2021-11-05 10:42:54 -04:00
parent 47adba879c
commit a7fe37f1fa
3 changed files with 11 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/or/protover.c
+7 -15
View File
@@ -478,20 +478,13 @@ protover_get_supported_protocols(void)
* XXX: WARNING!
*/
/*
* NOTE: A keen observer will notice that "LinkAuth" is not recommended nor
* required. This is due to the HAVE_WORKING_TOR_TLS_GET_TLSSECRETS define
* that can either set "1" or "1,3" and so we can't enforce one or the other
* due to this uncertainty on how tor was built.
*/
/** Return the recommended client protocols list that directory authorities
* put in the consensus. */
const char *
protover_get_recommended_client_protocols(void)
{
return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
"Link=4 Microdesc=1-2 Relay=2";
return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
"Link=4-5 Microdesc=2 Relay=2";
}
/** Return the recommended relay protocols list that directory authorities
@@ -499,8 +492,8 @@ protover_get_recommended_client_protocols(void)
const char *
protover_get_recommended_relay_protocols(void)
{
return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
"Link=4 Microdesc=1-2 Relay=2";
return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
"Link=4-5 LinkAuth=3 Microdesc=2 Relay=2";
}
/** Return the required client protocols list that directory authorities
@@ -508,8 +501,7 @@ protover_get_recommended_relay_protocols(void)
const char *
protover_get_required_client_protocols(void)
{
return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
"Link=4 Microdesc=1-2 Relay=2";
return "Cons=2 Desc=2 Link=4 Microdesc=2 Relay=2";
}
/** Return the required relay protocols list that directory authorities
@@ -517,8 +509,8 @@ protover_get_required_client_protocols(void)
const char *
protover_get_required_relay_protocols(void)
{
return "Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
"Link=3-4 Microdesc=1 Relay=1-2";
return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
"Link=4-5 LinkAuth=3 Microdesc=2 Relay=2";
}
/*
src/feature/dirauth/dirvote.h
-58
View File
@@ -260,64 +260,6 @@ char *networkstatus_get_detached_signatures(smartlist_t *consensuses);
STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
int consensus_method);
/** The recommended relay protocols for this authority's votes.
* Recommending a new protocol causes old tor versions to log a warning.
*/
#define DIRVOTE_RECOMMEND_RELAY_PROTO \
"Cons=2 " \
"Desc=2 " \
"DirCache=2 " \
"HSDir=2 " \
"HSIntro=4 " \
"HSRend=2 " \
"Link=4-5 " \
"LinkAuth=3 " \
"Microdesc=2 " \
"Relay=2"
/** The recommended client protocols for this authority's votes.
* Recommending a new protocol causes old tor versions to log a warning.
*/
#define DIRVOTE_RECOMMEND_CLIENT_PROTO \
"Cons=2 " \
"Desc=2 " \
"DirCache=2 " \
"HSDir=2 " \
"HSIntro=4 " \
"HSRend=2 " \
"Link=4-5 " \
"Microdesc=2 " \
"Relay=2"
/** The required relay protocols for this authority's votes.
* WARNING: Requiring a new protocol causes old tor versions to shut down.
* Requiring the wrong protocols can break the tor network.
* See Proposal 303: When and how to remove support for protocol versions.
*/
#define DIRVOTE_REQUIRE_RELAY_PROTO \
"Cons=2 " \
"Desc=2 " \
"DirCache=2 " \
"HSDir=2 " \
"HSIntro=4 " \
"HSRend=2 " \
"Link=4-5 " \
"LinkAuth=3 " \
"Microdesc=2 " \
"Relay=2"
/** The required relay protocols for this authority's votes.
* WARNING: Requiring a new protocol causes old tor versions to shut down.
* Requiring the wrong protocols can break the tor network.
* See Proposal 303: When and how to remove support for protocol versions.
*/
#define DIRVOTE_REQUIRE_CLIENT_PROTO \
"Cons=2 " \
"Desc=2 " \
"Link=4 " \
"Microdesc=2 " \
"Relay=2"
#endif /* defined(DIRVOTE_PRIVATE) */
#endif /* !defined(TOR_DIRVOTE_H) */
src/test/test_protover.c
+4 -4
View File
@@ -606,10 +606,10 @@ test_protover_vote_roundtrip_ours(void *args)
(void) args;
const char *examples[] = {
protover_get_supported_protocols(),
DIRVOTE_RECOMMEND_RELAY_PROTO,
DIRVOTE_RECOMMEND_CLIENT_PROTO,
DIRVOTE_REQUIRE_RELAY_PROTO,
DIRVOTE_REQUIRE_CLIENT_PROTO,
protover_get_recommended_client_protocols(),
protover_get_recommended_relay_protocols(),
protover_get_required_client_protocols(),
protover_get_required_relay_protocols(),
};
unsigned u;
smartlist_t *votes = smartlist_new();