Mercurial > hg > nginx

annotate auto/lib/openssl/make @ 5659:3fb6615bb87f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: plugged potential memory leak on reload. The SSL_CTX_set_cipher_list() may fail if there are no valid ciphers specified in proxy_ssl_ciphers / uwsgi_ssl_ciphers, resulting in SSL context leak. In theory, ngx_pool_cleanup_add() may fail too, but this case is intentionally left out for now as it's almost impossible and proper fix will require changes to http ssl and mail ssl code as well.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 18 Apr 2014 20:13:24 +0400
parents f817f9d1cded
children 83d54192e97b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
1
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
2 # Copyright (C) Igor Sysoev
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 3492
diff changeset
3 # Copyright (C) Nginx, Inc.
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
4
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
5
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
6 case "$CC" in
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
7
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
8 cl)
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
9
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
10 cat << END >> $NGX_MAKEFILE
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
11
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
12 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
13 \$(MAKE) -f auto/lib/openssl/makefile.msvc \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
14 OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT"
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
15
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
16 END
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
17
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
18 ;;
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
19
2897
d5d3fe7197cc *) use no-threads for Unix builds only
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
20 bcc32)
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
21
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
22 ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
23 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
24
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
25 cat << END >> $NGX_MAKEFILE
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
26
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
27 `echo "$OPENSSL\\openssl\\lib\\libeay32.lib: \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
28 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
29 | sed -e "s/\//$ngx_regex_dirsep/g"`
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
30
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
31 `echo "$OPENSSL\\openssl\\lib\\ssleay32.lib: \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
32 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
33 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
34
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
35 `echo "$OPENSSL\\openssl\\include\\openssl\\ssl.h: $NGX_MAKEFILE" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
36 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
37 \$(MAKE) -f auto/lib/openssl/makefile.bcc $ngx_opt
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
38
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
39 END
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
40
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
41 ;;
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
42
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
43 *)
2897
d5d3fe7197cc *) use no-threads for Unix builds only
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
44 case $USE_THREADS in
d5d3fe7197cc *) use no-threads for Unix builds only
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
45 NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
d5d3fe7197cc *) use no-threads for Unix builds only
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
46 *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
d5d3fe7197cc *) use no-threads for Unix builds only
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
47 esac
2879
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
48
2897
d5d3fe7197cc *) use no-threads for Unix builds only
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
49 case $OPENSSL in
3168
83c940b0d18a allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents: 2897
diff changeset
50 /*) ngx_prefix="$OPENSSL/.openssl" ;;
83c940b0d18a allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents: 2897
diff changeset
51 *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
2879
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
52 esac
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
53
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
54 cat << END >> $NGX_MAKEFILE
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
55
3168
83c940b0d18a allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents: 2897
diff changeset
56 $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
57 cd $OPENSSL \\
5438
f817f9d1cded Configure: call "make clean" for OpenSSL only if Makefile exists.
Piotr Sikora <piotr@cloudflare.com>
parents: 4412
diff changeset
58 && if [ -f Makefile ]; then \$(MAKE) clean; fi \\
2879
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
59 && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
2873
e069d0b8b198 fix building OpenSSL on Unix
Igor Sysoev <igor@sysoev.ru>
parents: 2846
diff changeset
60 && \$(MAKE) \\
3492
ee529182e59f fix building OpenSSL-1.0.0 on 64-bit Linux:
Igor Sysoev <igor@sysoev.ru>
parents: 3168
diff changeset
61 && \$(MAKE) install LIBDIR=lib
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
62
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
63 END
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
64
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
65 ;;
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
66
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
67 esac