diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-11 10:34:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-11 10:34:48 -0400 |
| commit | 667a12b471fd457dca5f564702da05a2fd9772d4 (patch) | |
| tree | 9745ec892a6e1a6490759273c4fb79a16b706bbd | |
| parent | 70910479e383806b98f15490abc5e45ceb1066d5 (diff) | |
| parent | e3243ad5f6a2c6acfd671e2cab22c4b6a4c21f47 (diff) | |
| download | tor-667a12b471fd457dca5f564702da05a2fd9772d4.tar.gz tor-667a12b471fd457dca5f564702da05a2fd9772d4.zip | |
Merge remote-tracking branch 'public/bug4592'
| -rw-r--r-- | changes/bug4592 | 3 | ||||
| -rw-r--r-- | src/common/tortls.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug4592 b/changes/bug4592 new file mode 100644 index 0000000000..31140b0ce8 --- /dev/null +++ b/changes/bug4592 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Detect SSL handshake even when the initial attempt to write the + server hello fails. Fix for bug 4592; bugfix on 0.2.0.13-alpha. diff --git a/src/common/tortls.c b/src/common/tortls.c index a62c2e6a8c..b2e43a47d7 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1372,7 +1372,8 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val) if (type != SSL_CB_ACCEPT_LOOP) return; - if (ssl->state != SSL3_ST_SW_SRVR_HELLO_A) + if ((ssl->state != SSL3_ST_SW_SRVR_HELLO_A) && + (ssl->state != SSL3_ST_SW_SRVR_HELLO_B)) return; tls = tor_tls_get_by_ssl(ssl); |