diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-04-01 15:18:29 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-04-01 15:18:29 +0000 |
| commit | 502252d43ae2ce0786d420ba01408cd6355bd100 (patch) | |
| tree | 93fd34eb6f48a9fd3a937812651a5c941bee8d11 | |
| parent | 6bdcc58a9cf60db8ea87716f97496319f21631e1 (diff) | |
| download | nginx-502252d43ae2ce0786d420ba01408cd6355bd100.tar.gz nginx-502252d43ae2ce0786d420ba01408cd6355bd100.tar.bz2 | |
MSVC8 compatibility with OpenSSL 1.0.0
| -rw-r--r-- | auto/lib/openssl/conf | 2 | ||||
| -rw-r--r-- | auto/lib/openssl/makefile.bcc | 3 | ||||
| -rw-r--r-- | auto/lib/openssl/makefile.msvc | 3 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl.c | 3 |
4 files changed, 7 insertions, 4 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/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/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); |