Klaus Demo nginx / 400683a
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 Igor Sysoev 12 years ago
6 changed file(s) with 9 addition(s) and 6 deletion(s). Raw diff Collapse all Expand all
+2
-0
auto/lib/openssl/conf less more
1818
1919 # libeay32.lib requires gdi32.lib
2020 CORE_LIBS="$CORE_LIBS gdi32.lib"
21 # OpenSSL 1.0.0 requires crypt32.lib
22 CORE_LIBS="$CORE_LIBS crypt32.lib"
2123 ;;
2224
2325 *)
+1
-1
auto/lib/openssl/make less more
5656 && \$(MAKE) clean \\
5757 && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
5858 && \$(MAKE) \\
59 && \$(MAKE) install
59 && \$(MAKE) install LIBDIR=lib
6060
6161 END
6262
+1
-2
auto/lib/openssl/makefile.bcc less more
44 all:
55 cd $(OPENSSL)
66
7 perl Configure BC-32 no-shared --prefix=openssl -DNO_SYS_TYPES_H \
8 $(OPENSSL_OPT)
7 perl Configure BC-32 no-shared --prefix=openssl $(OPENSSL_OPT)
98
109 ms\do_nasm
1110
+1
-2
auto/lib/openssl/makefile.msvc less more
44 all:
55 cd $(OPENSSL)
66
7 perl Configure VC-WIN32 no-shared --prefix=openssl -DNO_SYS_TYPES_H \
8 $(OPENSSL_OPT)
7 perl Configure VC-WIN32 no-shared --prefix=openssl $(OPENSSL_OPT)
98
109 ms\do_ms
1110
+1
-1
misc/GNUmakefile less more
44 TEMP = tmp
55
66 OBJS = objs.msvc8
7 OPENSSL = openssl-0.9.8k
7 OPENSSL = openssl-0.9.8n
88 ZLIB = zlib-1.2.3
99 PCRE = pcre-7.9
1010
+3
-0
src/event/ngx_event_openssl.c less more
560560 #if (NGX_DEBUG)
561561 {
562562 char buf[129], *s, *d;
563 #if OPENSSL_VERSION_NUMBER >= 0x1000000fL
564 const
565 #endif
563566 SSL_CIPHER *cipher;
564567
565568 cipher = SSL_get_current_cipher(c->ssl->connection);