Updated OpenSSL used for win32 builds.

Note that as of OpenSSL 1.0.0, the "ms\do_ms" script (previously documented
to be used if one doesn't want to use the assembly language files) tries to
use MASM.  Additionally, OpenSSL 1.0.2 finally broke MASM support.  To fix
this, we now explicitly use "no-asm" in OpenSSL options.

diff --git a/misc/GNUmakefile b/misc/GNUmakefile
index a15e7e9e5400f7b5ecd16dadb3d90b03962ca331..a20b8fffe8c15de8d5f5dd04329a8e221d14972f 100644 (file)
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -5,7 +5,7 @@ NGINX =         nginx-$(VER)
 TEMP =         tmp
 
 OBJS =         objs.msvc8
-OPENSSL =      openssl-1.0.1p
+OPENSSL =      openssl-1.0.2d
 ZLIB =         zlib-1.2.8
 PCRE =         pcre-8.37
 
@@ -82,7 +82,7 @@ win32:
                --with-mail                                             \
                --with-stream                                           \
                --with-openssl=$(OBJS)/lib/$(OPENSSL)                   \
-               --with-openssl-opt=enable-tlsext                        \
+               --with-openssl-opt=no-asm                               \
                --with-http_ssl_module                                  \
                --with-mail_ssl_module                                  \
                --with-stream_ssl_module                                \