Mercurial > hg > nginx

annotate auto/lib/openssl/conf @ 3430:966f9cf9c7da stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3155, r3156, r3160, r969, r3191, r3197, r3358: SSL fixes: *) $ssl_session_id *) allow "make clean" for OpenSSL, the bug was introduced in r2874 *) disable SSLv2 and use only strong ciphers by default *) decrease SSL handshake error level to info
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Feb 2010 14:39:16 +0000
parents cb3d4dc8c6db
children 92378c49456d
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
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
3
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
4
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5 if [ $OPENSSL != NONE ]; then
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
6
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7 case "$CC" in
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 875
diff changeset
8
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2817
diff changeset
9 cl | bcc32)
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 875
diff changeset
10 have=NGX_OPENSSL . auto/have
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 875
diff changeset
11 have=NGX_SSL . auto/have
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 875
diff changeset
12
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2817
diff changeset
13 CFLAGS="$CFLAGS -DNO_SYS_TYPES_H"
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 875
diff changeset
14
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2817
diff changeset
15 CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2817
diff changeset
16 CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2817
diff changeset
17 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2817
diff changeset
18 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 875
diff changeset
19
2731
06d53ecd70c8 *) move advapi32.lib to core libs since it's required for Registry and Event Log
Igor Sysoev <igor@sysoev.ru>
parents: 2712
diff changeset
20 # libeay32.lib requires gdi32.lib
06d53ecd70c8 *) move advapi32.lib to core libs since it's required for Registry and Event Log
Igor Sysoev <igor@sysoev.ru>
parents: 2712
diff changeset
21 CORE_LIBS="$CORE_LIBS gdi32.lib"
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 875
diff changeset
22 ;;
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 875
diff changeset
23
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
24 *)
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
25 have=NGX_OPENSSL . auto/have
577
4d9ea73a627a nginx-0.3.10-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 561
diff changeset
26 have=NGX_SSL . auto/have
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2817
diff changeset
27
3430
966f9cf9c7da merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
Igor Sysoev <igor@sysoev.ru>
parents: 2940
diff changeset
28 CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include"
966f9cf9c7da merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
Igor Sysoev <igor@sysoev.ru>
parents: 2940
diff changeset
29 CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
966f9cf9c7da merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
Igor Sysoev <igor@sysoev.ru>
parents: 2940
diff changeset
30 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
966f9cf9c7da merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
Igor Sysoev <igor@sysoev.ru>
parents: 2940
diff changeset
31 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
2817
38e59bcc35f2 test whether libdl is required for dynamic linking:
Igor Sysoev <igor@sysoev.ru>
parents: 2731
diff changeset
32 CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
479
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
33 ;;
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
34 esac
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
35
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
36 else
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
37
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
38 case "$NGX_PLATFORM" in
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
39
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
40 win32)
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
41 have=NGX_OPENSSL . auto/have
577
4d9ea73a627a nginx-0.3.10-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 561
diff changeset
42 have=NGX_SSL . auto/have
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
43 OPENSSL=YES
561
e48ebafc6939 nginx-0.3.2-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 541
diff changeset
44
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
45 CORE_INCS="$CORE_INCS c:/openssl/include"
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
46 CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib"
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
47 CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib"
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
48
2731
06d53ecd70c8 *) move advapi32.lib to core libs since it's required for Registry and Event Log
Igor Sysoev <igor@sysoev.ru>
parents: 2712
diff changeset
49 # libeay32.lib requires gdi32.lib
06d53ecd70c8 *) move advapi32.lib to core libs since it's required for Registry and Event Log
Igor Sysoev <igor@sysoev.ru>
parents: 2712
diff changeset
50 CORE_LIBS="$CORE_LIBS gdi32.lib"
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
51 ;;
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
52
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
53 *)
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
54 OPENSSL=NO
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
55
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
56 ngx_feature="OpenSSL library"
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
57 ngx_feature_name="NGX_OPENSSL"
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
58 ngx_feature_run=no
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
59 ngx_feature_incs="#include <openssl/ssl.h>"
875
7af8276b1c2f test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents: 583
diff changeset
60 ngx_feature_path=
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
61 ngx_feature_libs="-lssl -lcrypto"
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
62 ngx_feature_test="SSL_library_init()"
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
63 . auto/feature
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
64
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
65 if [ $ngx_found = yes ]; then
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
66 have=NGX_SSL . auto/have
2876
658725e3eef4 use -ldl for any OS that needs it
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
67 CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
68 OPENSSL=YES
2940
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
69 else
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
70
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
71 cat << END
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
72
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
73 $0: error: SSL modules require the OpenSSL library.
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
74 You can either do not enable the modules, or install the OpenSSL library
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
75 into the system, or build the OpenSSL library statically from the source
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
76 with nginx by using --with-openssl=<path> option.
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
77
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
78 END
cb3d4dc8c6db merge r2893, r2894, and r2917:
Igor Sysoev <igor@sysoev.ru>
parents: 2876
diff changeset
79 exit 1
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
80 fi
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
81 ;;
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
82
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
83 esac
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
84
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
85 fi