mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-20 10:12:15 +01:00
Merge remote-tracking branch 'public/feature20552'
This commit is contained in:
commit
b6164e1604
4
changes/feature20552
Normal file
4
changes/feature20552
Normal file
@ -0,0 +1,4 @@
|
||||
o Minor features (ed25519 link handshake):
|
||||
- Advertise support for the ed25519 link handshake using the
|
||||
subprotocol-versions mechanism, so that clients can tell which
|
||||
relays can identity themselves by Ed25519 ID.
|
@ -2265,6 +2265,10 @@ typedef struct routerstatus_t {
|
||||
* accept EXTEND2 cells */
|
||||
unsigned int supports_extend2_cells:1;
|
||||
|
||||
/** True iff this router has a protocol list that allows it to negotiate
|
||||
* ed25519 identity keys on a link handshake. */
|
||||
unsigned int supports_ed25519_link_handshake:1;
|
||||
|
||||
unsigned int has_bandwidth:1; /**< The vote/consensus had bw info */
|
||||
unsigned int has_exitsummary:1; /**< The vote/consensus had exit summaries */
|
||||
unsigned int bw_is_unmeasured:1; /**< This is a consensus entry, with
|
||||
|
@ -293,7 +293,7 @@ protover_get_supported_protocols(void)
|
||||
"HSIntro=3 "
|
||||
"HSRend=1-2 "
|
||||
"Link=1-4 "
|
||||
"LinkAuth=1 "
|
||||
"LinkAuth=1,3 "
|
||||
"Microdesc=1-2 "
|
||||
"Relay=1-2";
|
||||
}
|
||||
|
@ -2682,6 +2682,8 @@ routerstatus_parse_entry_from_string(memarea_t *area,
|
||||
rs->protocols_known = 1;
|
||||
rs->supports_extend2_cells =
|
||||
protocol_list_supports_protocol(tok->args[0], PRT_RELAY, 2);
|
||||
rs->supports_ed25519_link_handshake =
|
||||
protocol_list_supports_protocol(tok->args[0], PRT_LINKAUTH, 3);
|
||||
}
|
||||
if ((tok = find_opt_by_keyword(tokens, K_V))) {
|
||||
tor_assert(tok->n_args == 1);
|
||||
|
Loading…
Reference in New Issue
Block a user