aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-10-16 12:55:50 -0400
committerNick Mathewson <nickm@torproject.org>2012-10-17 19:18:16 -0400
commitf357ef9dccccfb5ce2408dbd5f8456de02bac895 (patch)
treecfd709e594c28e4c4f73fd3bbb48ccd51b98f6c1 /src/or/connection_or.h
parente2549c3b745313d6647c7e1d05025a84e1d33873 (diff)
downloadtor-f357ef9dccccfb5ce2408dbd5f8456de02bac895.tar
tor-f357ef9dccccfb5ce2408dbd5f8456de02bac895.tar.gz
Discard extraneous renegotiation attempts in the v3 link protocol
Failure to do so left us open to a remotely triggerable assertion failure. Fixes CVE-2012-2249; bugfix on 0.2.3.6-alpha. Reported by "some guy from France".
Diffstat (limited to 'src/or/connection_or.h')
-rw-r--r--src/or/connection_or.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/connection_or.h b/src/or/connection_or.h
index 3e98f5cce..b78c44492 100644
--- a/src/or/connection_or.h
+++ b/src/or/connection_or.h
@@ -21,6 +21,7 @@ or_connection_t *connection_or_get_for_extend(const char *digest,
int *launch_out);
void connection_or_set_bad_connections(const char *digest, int force);
+void connection_or_block_renegotiation(or_connection_t *conn);
int connection_or_reached_eof(or_connection_t *conn);
int connection_or_process_inbuf(or_connection_t *conn);
int connection_or_flushed_some(or_connection_t *conn);