GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit ec0f0004 authored by Nick Mathewson's avatar Nick Mathewson 🐭

Merge branch 'maint-0.4.3' into maint-0.4.4

parents b0e6ec62 0b2c64ef
Pipeline #1620 canceled with stage
o Minor bugfixes (security):
- When completing a channel, relays now check more thoroughly to make
sure that it matches any pending circuits before attaching those
circuits. Previously, address correctness and Ed25519 identities were not
checked in this case, but only when extending circuits on an existing
channel. Fixes bug 40080; bugfix on 0.2.7.2-alpha.
...@@ -670,7 +670,7 @@ channel_find_by_global_id(uint64_t global_identifier) ...@@ -670,7 +670,7 @@ channel_find_by_global_id(uint64_t global_identifier)
/** Return true iff <b>chan</b> matches <b>rsa_id_digest</b> and <b>ed_id</b>. /** Return true iff <b>chan</b> matches <b>rsa_id_digest</b> and <b>ed_id</b>.
* as its identity keys. If either is NULL, do not check for a match. */ * as its identity keys. If either is NULL, do not check for a match. */
static int int
channel_remote_identity_matches(const channel_t *chan, channel_remote_identity_matches(const channel_t *chan,
const char *rsa_id_digest, const char *rsa_id_digest,
const ed25519_public_key_t *ed_id) const ed25519_public_key_t *ed_id)
......
...@@ -735,6 +735,9 @@ int channel_is_outgoing(channel_t *chan); ...@@ -735,6 +735,9 @@ int channel_is_outgoing(channel_t *chan);
void channel_mark_client(channel_t *chan); void channel_mark_client(channel_t *chan);
void channel_clear_client(channel_t *chan); void channel_clear_client(channel_t *chan);
int channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info); int channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info);
int channel_remote_identity_matches(const channel_t *chan,
const char *rsa_id_digest,
const ed25519_public_key_t *ed_id);
unsigned int channel_num_circuits(channel_t *chan); unsigned int channel_num_circuits(channel_t *chan);
MOCK_DECL(void,channel_set_circid_type,(channel_t *chan, MOCK_DECL(void,channel_set_circid_type,(channel_t *chan,
crypto_pk_t *identity_rcvd, crypto_pk_t *identity_rcvd,
......
...@@ -643,21 +643,37 @@ circuit_n_chan_done(channel_t *chan, int status, int close_origin_circuits) ...@@ -643,21 +643,37 @@ circuit_n_chan_done(channel_t *chan, int status, int close_origin_circuits)
circ->state != CIRCUIT_STATE_CHAN_WAIT) circ->state != CIRCUIT_STATE_CHAN_WAIT)
continue; continue;
if (tor_digest_is_zero(circ->n_hop->identity_digest)) { const char *rsa_ident = NULL;
const ed25519_public_key_t *ed_ident = NULL;
if (! tor_digest_is_zero(circ->n_hop->identity_digest)) {
rsa_ident = circ->n_hop->identity_digest;
}
if (! ed25519_public_key_is_zero(&circ->n_hop->ed_identity)) {
ed_ident = &circ->n_hop->ed_identity;
}
if (rsa_ident == NULL && ed_ident == NULL) {
/* Look at addr/port. This is an unkeyed connection. */ /* Look at addr/port. This is an unkeyed connection. */
if (!channel_matches_extend_info(chan, circ->n_hop)) if (!channel_matches_extend_info(chan, circ->n_hop))
continue; continue;
} else { } else {
/* We expected a key. See if it's the right one. */ /* We expected a key or keys. See if they matched. */
if (tor_memneq(chan->identity_digest, if (!channel_remote_identity_matches(chan, rsa_ident, ed_ident))
circ->n_hop->identity_digest, DIGEST_LEN))
continue; continue;
/* If the channel is canonical, great. If not, it needs to match
* the requested address exactly. */
if (! chan->is_canonical &&
! channel_matches_extend_info(chan, circ->n_hop)) {
continue;
}
} }
if (!status) { /* chan failed; close circ */ if (!status) { /* chan failed; close circ */
log_info(LD_CIRC,"Channel failed; closing circ."); log_info(LD_CIRC,"Channel failed; closing circ.");
circuit_mark_for_close(circ, END_CIRC_REASON_CHANNEL_CLOSED); circuit_mark_for_close(circ, END_CIRC_REASON_CHANNEL_CLOSED);
continue; continue;
} }
if (close_origin_circuits && CIRCUIT_IS_ORIGIN(circ)) { if (close_origin_circuits && CIRCUIT_IS_ORIGIN(circ)) {
log_info(LD_CIRC,"Channel deprecated for origin circs; closing circ."); log_info(LD_CIRC,"Channel deprecated for origin circs; closing circ.");
circuit_mark_for_close(circ, END_CIRC_REASON_CHANNEL_CLOSED); circuit_mark_for_close(circ, END_CIRC_REASON_CHANNEL_CLOSED);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment