mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-13 06:12:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge r3489, r3493:

Browse Source 
*) 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
This commit is contained in:
Igor Sysoev 2010-06-07 11:55:20 +00:00
parent a16387eba9
commit 400683ac91
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/lib/openssl/conf
View File

@ -19,6 +19,8 @@ if [ $OPENSSL != NONE ]; then
# libeay32.lib requires gdi32.lib # libeay32.lib requires gdi32.lib
CORE_LIBS="$CORE_LIBS gdi32.lib" CORE_LIBS="$CORE_LIBS gdi32.lib"
# OpenSSL 1.0.0 requires crypt32.lib
CORE_LIBS="$CORE_LIBS crypt32.lib"
;; ;;
*) *)

2
auto/lib/openssl/make
View File

@ -57,7 +57,7 @@ $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
&& \$(MAKE) clean \\ && \$(MAKE) clean \\
&& ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\ && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
&& \$(MAKE) \\ && \$(MAKE) \\
&& \$(MAKE) install && \$(MAKE) install LIBDIR=lib
END END

3
auto/lib/openssl/makefile.bcc
View File

@ -5,8 +5,7 @@
all: all:
cd $(OPENSSL) cd $(OPENSSL)
perl Configure BC-32 no-shared --prefix=openssl -DNO_SYS_TYPES_H \ perl Configure BC-32 no-shared --prefix=openssl $(OPENSSL_OPT)
$(OPENSSL_OPT)
ms\do_nasm ms\do_nasm

3
auto/lib/openssl/makefile.msvc
View File

@ -5,8 +5,7 @@
all: all:
cd $(OPENSSL) cd $(OPENSSL)
perl Configure VC-WIN32 no-shared --prefix=openssl -DNO_SYS_TYPES_H \ perl Configure VC-WIN32 no-shared --prefix=openssl $(OPENSSL_OPT)
$(OPENSSL_OPT)
ms\do_ms ms\do_ms

2
misc/GNUmakefile
View File

@ -5,7 +5,7 @@ NGINX = nginx-$(VER)
TEMP = tmp TEMP = tmp
OBJS = objs.msvc8 OBJS = objs.msvc8
OPENSSL = openssl-0.9.8k OPENSSL = openssl-0.9.8n
ZLIB = zlib-1.2.3 ZLIB = zlib-1.2.3
PCRE = pcre-7.9 PCRE = pcre-7.9

3
src/event/ngx_event_openssl.c
View File

@ -561,6 +561,9 @@ ngx_ssl_handshake(ngx_connection_t *c)
#if (NGX_DEBUG) #if (NGX_DEBUG)
{ {
char buf[129], *s, *d; char buf[129], *s, *d;
#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
const
#endif
SSL_CIPHER *cipher; SSL_CIPHER *cipher;
cipher = SSL_get_current_cipher(c->ssl->connection); cipher = SSL_get_current_cipher(c->ssl->connection);