diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-02-12 21:39:33 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-02-12 21:39:33 +0000 |
| commit | 0c40a080a493c9ffc76c78e9795f64d3a194a36c (patch) | |
| tree | be67d7c594d95ddc9fc92fa3342ab180f73e8dfb /src/or/circuitbuild.c | |
| parent | 3af0d90a7ae26453ebc49504cc3591ec13bb6f6f (diff) | |
| download | tor-0c40a080a493c9ffc76c78e9795f64d3a194a36c.tar.gz tor-0c40a080a493c9ffc76c78e9795f64d3a194a36c.zip | |
r11773@catbus: nickm | 2007-02-12 15:18:48 -0500
Implement proposal 106: stop requiring clients to have certificates, and stop checking for nicknames in certificates. [See proposal 106 for rationale.] Also improve messages when checking TLS handshake, to re-resolve bug 382.
svn:r9568
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6f3736b9aa..58f10ed8fe 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -70,6 +70,11 @@ get_unique_circ_id_by_conn(or_connection_t *conn) uint16_t high_bit; tor_assert(conn); + if (conn->circ_id_type == CIRC_ID_TYPE_NEITHER) { + log_warn(LD_BUG, "Bug: Trying to pick a circuit ID for a connection from " + "a client with no identity."); + return 0; + } high_bit = (conn->circ_id_type == CIRC_ID_TYPE_HIGHER) ? 1<<15 : 0; do { /* Sequentially iterate over test_circ_id=1...1<<15-1 until we find a |