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

protover: Sort tor's supported protocol versions

Browse Source 
As recommended by the tor directory specification.

Fixes bug 33285; bugfix on 0.4.0.1-alpha.
This commit is contained in:
teor 2020-02-12 22:15:17 +10:00
parent 14cb337e80
commit 4fed49e0dd
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug33285 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (protocol versions):
- Sort tor's supported protocol version lists, as recommended by the
tor directory specification. Fixes bug 33285; bugfix on 0.4.0.1-alpha.

4
src/core/or/protover.c
View File

@ -391,6 +391,7 @@ protover_get_supported_protocols(void)
"Cons=1-2 "
"Desc=1-2 "
"DirCache=1-2 "
"FlowCtrl=1 "
"HSDir=1-2 "
"HSIntro=3-5 "
"HSRend=1-2 "
@ -401,9 +402,8 @@ protover_get_supported_protocols(void)
"LinkAuth=3 "
#endif
"Microdesc=1-2 "
"Relay=1-2 "
"Padding=2 "
"FlowCtrl=1";
"Relay=1-2";
}
/** The protocols from protover_get_supported_protocols(), as parsed into a

8
src/rust/protover/protover.rs
View File

@ -161,30 +161,30 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
"Cons=1-2 \
Desc=1-2 \
DirCache=1-2 \
FlowCtrl=1 \
HSDir=1-2 \
HSIntro=3-4 \
HSRend=1-2 \
Link=1-5 \
LinkAuth=3 \
Microdesc=1-2 \
Relay=1-2 \
Padding=2 \
FlowCtrl=1"
Relay=1-2"
)
} else {
cstr!(
"Cons=1-2 \
Desc=1-2 \
DirCache=1-2 \
FlowCtrl=1 \
HSDir=1-2 \
HSIntro=3-4 \
HSRend=1-2 \
Link=1-5 \
LinkAuth=1,3 \
Microdesc=1-2 \
Relay=1-2 \
Padding=2 \
FlowCtrl=1"
Relay=1-2"
)
}
}