Mercurial > hg > nginx-quic
annotate auto/lib/sha1/conf @ 5920:7420068c4d4b
Resolver: fixed use-after-free memory access.
In 954867a2f0a6, we switched to using resolver node as the
timer event data, so make sure we do not free resolver node
memory until the corresponding timer is deleted.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 20 Nov 2014 15:24:40 +0300 |
parents | b0a616778038 |
children | 78f8ac479735 |
rev | line source |
---|---|
653 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
653 | 4 |
5 | |
6 if [ $SHA1 != NONE ]; then | |
7 | |
3922
9c057d5e1c27
"$apr1", "{PLAIN}", and "{SSHA}" password methods in auth basic module
Igor Sysoev <igor@sysoev.ru>
parents:
2010
diff
changeset
|
8 have=NGX_HAVE_SHA1 . auto/have |
653 | 9 CORE_INCS="$CORE_INCS $SHA1" |
10 | |
11 case "$NGX_CC_NAME" in | |
12 | |
13 msvc* | owc* | bcc) | |
14 LINK_DEPS="$LINK_DEPS $SHA1/sha1.lib" | |
15 CORE_LIBS="$CORE_LIBS $SHA1/sha1.lib" | |
16 ;; | |
17 | |
18 icc*) | |
19 LINK_DEPS="$LINK_DEPS $SHA1/libsha.a" | |
20 | |
21 # to allow -ipo optimization we link with the *.o but not library | |
22 CORE_LIBS="$CORE_LIBS $SHA1/sha1_dgst.o" | |
23 | |
24 if [ $SHA1_ASM = YES ]; then | |
25 CORE_LIBS="$CORE_LIBS $SHA1/asm/sx86-elf.o" | |
26 fi | |
27 ;; | |
28 | |
29 *) | |
30 LINK_DEPS="$LINK_DEPS $SHA1/libsha.a" | |
31 CORE_LIBS="$CORE_LIBS $SHA1/libsha.a" | |
32 #CORE_LIBS="$CORE_LIBS -L $SHA1 -lsha" | |
33 ;; | |
34 | |
35 esac | |
36 | |
37 else | |
38 | |
39 if [ "$NGX_PLATFORM" != win32 ]; then | |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
40 |
653 | 41 SHA1=NO |
42 | |
43 # FreeBSD | |
44 | |
45 ngx_feature="sha1 in system md library" | |
3922
9c057d5e1c27
"$apr1", "{PLAIN}", and "{SSHA}" password methods in auth basic module
Igor Sysoev <igor@sysoev.ru>
parents:
2010
diff
changeset
|
46 ngx_feature_name=NGX_HAVE_SHA1 |
653 | 47 ngx_feature_run=no |
48 ngx_feature_incs="#include <sha.h>" | |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
653
diff
changeset
|
49 ngx_feature_path= |
653 | 50 ngx_feature_libs="-lmd" |
51 ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)" | |
52 . auto/feature | |
53 | |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
54 ngx_sha1_lib="system md" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
55 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
56 if [ $ngx_found = no ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
57 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
58 # OpenSSL crypto library |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
59 |
5179
b0a616778038
Configure: uniformly refer to libs when searching for md5 and sha1.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
60 ngx_feature="sha1 in system OpenSSL crypto library" |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
61 ngx_feature_incs="#include <openssl/sha.h>" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
62 ngx_feature_libs="-lcrypto" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
63 . auto/feature |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
64 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
65 ngx_sha1_lib="system crypto" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
66 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
67 if [ $ngx_found = yes ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
68 have=NGX_HAVE_OPENSSL_SHA1_H . auto/have |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
69 fi |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
70 fi |
653 | 71 |
72 if [ $ngx_found = yes ]; then | |
73 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" | |
74 SHA1=YES | |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
75 SHA1_LIB=$ngx_sha1_lib |
653 | 76 fi |
77 fi | |
78 | |
79 fi |