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

diff --git a/misc/GNUmakefile b/misc/GNUmakefile
index 4e5ff26ff1b3b02d6ad021ae170230313fd126a3..9ad20cfdef2b956c2d0343482f4cbcc238ead04c 100644 (file)
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -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
 

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 7a18980c48ff9080d67d85c8507d345a82dca2cf..08b7d467818c141f658e43b566b9b6832e6b13bb 100644 (file)
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -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]);