SSL related fixes:

*) merge r3675:
   fix recognition of SSLv2 Client Hello Packet large than 255 bytes
*) upgrade OpenSSL to 0.8.9q in nginx/Windows
This commit is contained in:
Igor Sysoev 2010-12-14 19:29:57 +00:00
parent aad4528125
commit 813d95d705
2 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@ NGINX = nginx-$(VER)
TEMP = tmp
OBJS = objs.msvc8
OPENSSL = openssl-0.9.8n
OPENSSL = openssl-0.9.8q
ZLIB = zlib-1.2.3
PCRE = pcre-7.9

View File

@ -551,7 +551,7 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
}
if (n == 1) {
if (buf[0] == 0x80 /* SSLv2 */ || buf[0] == 0x16 /* SSLv3/TLSv1 */) {
if (buf[0] & 0x80 /* SSLv2 */ || buf[0] == 0x16 /* SSLv3/TLSv1 */) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, rev->log, 0,
"https ssl handshake: 0x%02Xd", buf[0]);