From e37a514ae4ad973556d39afd46a4c88b1022b111 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 17 Aug 2015 18:09:20 +0300 Subject: [PATCH] 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. --- misc/GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/GNUmakefile b/misc/GNUmakefile index a15e7e9e5..a20b8fffe 100644 --- 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 \