diff options
author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-07-08 14:46:00 +1000 |
---|---|---|
committer | teor <teor2345@gmail.com> | 2016-08-24 11:02:00 +1000 |
commit | 10aa913accaf81d72dba6f1bcd9dcc128d9d8703 (patch) | |
tree | 8e7d4db300c9bc8c5a5b1f25c45aa9107ea6f3b7 /src/or/nodelist.c | |
parent | cad9046632aa168eabda1694775393b38922a03e (diff) | |
download | tor-10aa913accaf81d72dba6f1bcd9dcc128d9d8703.tar.gz tor-10aa913accaf81d72dba6f1bcd9dcc128d9d8703.zip |
Client & HS ignore UseNTorHandshake, all non-HS handshakes use ntor
Rely on onion_populate_cpath to check that we're only using
TAP for the rare hidden service cases.
Check and log if handshakes only support TAP when they should support
ntor.
Diffstat (limited to 'src/or/nodelist.c')
-rw-r--r-- | src/or/nodelist.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c index a888ebefbd..391b682f44 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1196,6 +1196,9 @@ microdesc_has_curve25519_onion_key(const microdesc_t *md) int node_has_curve25519_onion_key(const node_t *node) { + if (!node) + return 0; + if (node->ri) return routerinfo_has_curve25519_onion_key(node->ri); else if (node->md) |