diff options
| author | George Kadianakis <desnacked@riseup.net> | 2017-08-03 16:00:18 +0300 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-08 20:29:34 -0400 |
| commit | f106af3c41dffdc8576c52399a61d34116b78f38 (patch) | |
| tree | 42e5dbbf88c551ce0462111f15da3248ca6da726 /src/or/hs_circuit.c | |
| parent | d88984a137b9f06fd72f57636b6ec321044c8908 (diff) | |
| download | tor-f106af3c41dffdc8576c52399a61d34116b78f38.tar.gz tor-f106af3c41dffdc8576c52399a61d34116b78f38.zip | |
Make ed25519 id keys optional for IPs and RPs.
Diffstat (limited to 'src/or/hs_circuit.c')
| -rw-r--r-- | src/or/hs_circuit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index c78ac6057f..3d67f24cb8 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -406,7 +406,7 @@ get_rp_extend_info(const smartlist_t *link_specifiers, } SMARTLIST_FOREACH_END(ls); /* IPv4, legacy ID and ed25519 are mandatory. */ - if (!have_v4 || !have_legacy_id || !have_ed25519_id) { + if (!have_v4 || !have_legacy_id) { goto done; } /* By default, we pick IPv4 but this might change to v6 if certain @@ -451,7 +451,9 @@ get_rp_extend_info(const smartlist_t *link_specifiers, } /* We do have everything for which we think we can connect successfully. */ - info = extend_info_new(NULL, legacy_id, &ed25519_pk, NULL, onion_key, + info = extend_info_new(NULL, legacy_id, + have_ed25519_id ? &ed25519_pk : NULL, + NULL, onion_key, addr, port); done: return info; |