diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 11:55:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 11:55:20 +0000 |
| commit | 400683ac9102ee18564bb6eff0037e710fb48d9f (patch) | |
| tree | 5dccb1c311036c2412f0587c13b47fc7d4149831 | |
| parent | a16387eba9b14d48be0e0644f6030f880b652836 (diff) | |
| download | nginx-400683ac9102ee18564bb6eff0037e710fb48d9f.tar.gz | |
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
| -rw-r--r-- | auto/lib/openssl/conf | 2 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 2 | ||||
| -rw-r--r-- | auto/lib/openssl/makefile.bcc | 3 | ||||
| -rw-r--r-- | auto/lib/openssl/makefile.msvc | 3 | ||||
| -rw-r--r-- | misc/GNUmakefile | 2 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl.c | 3 |
6 files changed, 9 insertions, 6 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 64f2ce02f..c57a7c830 100644 --- 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 d497d88e1..a2025bbd6 100644 --- 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 679e7fe4a..5938cbf6b 100644 --- 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 0e45c487f..379b95dc0 100644 --- 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 eed4afa99..4e5ff26ff 100644 --- 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 4a05444a0..5eab4affb 100644 --- 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); |