merge r3489, r3493:

*) MSVC8 compatibility with OpenSSL 1.0.0
*) fix building OpenSSL-1.0.0 on 64-bit Linux:
   make installs the libraries in lib64 directory

and build nginx/Windows against OpenSSL-0.9.8n

diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 64f2ce02fae2beb0128e822b1e68af7eee73d073..c57a7c830675b5e5cd9cf0f49388cdbea82e2490 100644 (file)
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -19,6 +19,8 @@ if [ $OPENSSL != NONE ]; then
 
             # libeay32.lib requires gdi32.lib
             CORE_LIBS="$CORE_LIBS gdi32.lib"
+            # OpenSSL 1.0.0 requires crypt32.lib
+            CORE_LIBS="$CORE_LIBS crypt32.lib"
         ;;
 
         *)

diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index d497d88e18b894262ab646be87d014c933ca4130..a2025bbd669e7973ee6167009236570691783cc4 100644 (file)
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -57,7 +57,7 @@ $OPENSSL/.openssl/include/openssl/ssl.h:      $NGX_MAKEFILE
        && \$(MAKE) clean \\
        && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
        && \$(MAKE) \\
-       && \$(MAKE) install
+       && \$(MAKE) install LIBDIR=lib
 
 END
 

diff --git a/auto/lib/openssl/makefile.bcc b/auto/lib/openssl/makefile.bcc
index 679e7fe4adb794a6495e5b93ce8182945c231777..5938cbf6b3a37e745f75f5f8c79fd3a0faecd730 100644 (file)
--- a/auto/lib/openssl/makefile.bcc
+++ b/auto/lib/openssl/makefile.bcc
@@ -5,8 +5,7 @@
 all:
        cd $(OPENSSL)
 
-       perl Configure BC-32 no-shared --prefix=openssl -DNO_SYS_TYPES_H \
-               $(OPENSSL_OPT)
+       perl Configure BC-32 no-shared --prefix=openssl $(OPENSSL_OPT)
 
        ms\do_nasm
 

diff --git a/auto/lib/openssl/makefile.msvc b/auto/lib/openssl/makefile.msvc
index 0e45c487f2aa681b20213b695cbe8076b341d06e..379b95dc0281811a0e2d169b11fbdb502aee888a 100644 (file)
--- a/auto/lib/openssl/makefile.msvc
+++ b/auto/lib/openssl/makefile.msvc
@@ -5,8 +5,7 @@
 all:
        cd $(OPENSSL)
 
-       perl Configure VC-WIN32 no-shared --prefix=openssl -DNO_SYS_TYPES_H \
-               $(OPENSSL_OPT)
+       perl Configure VC-WIN32 no-shared --prefix=openssl $(OPENSSL_OPT)
 
        ms\do_ms
 

diff --git a/misc/GNUmakefile b/misc/GNUmakefile
index eed4afa99223b24a0d4c2f90638eb8c136a3c963..4e5ff26ff1b3b02d6ad021ae170230313fd126a3 100644 (file)
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -5,7 +5,7 @@ NGINX =         nginx-$(VER)
 TEMP =         tmp
 
 OBJS =         objs.msvc8
-OPENSSL =      openssl-0.9.8k
+OPENSSL =      openssl-0.9.8n
 ZLIB =         zlib-1.2.3
 PCRE =         pcre-7.9
 

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 4a05444a0d4bbc16d0817ad43ca8d242e417ced7..5eab4affb73d06c74ea8b7293c4a21396398ce70 100644 (file)
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -561,6 +561,9 @@ ngx_ssl_handshake(ngx_connection_t *c)
 #if (NGX_DEBUG)
         {
         char         buf[129], *s, *d;
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+        const
+#endif
         SSL_CIPHER  *cipher;
 
         cipher = SSL_get_current_cipher(c->ssl->connection);