IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

MSVC8 compatibility with OpenSSL 1.0.0

Browse Source
This commit is contained in:
Igor Sysoev
2010-04-01 15:18:29 +00:00
parent 6bdcc58a9c
commit 502252d43a
4 changed files with 7 additions and 4 deletions
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"
;; ;;
*) *)

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

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);