Mercurial > hg > nginx
annotate auto/lib/sha1/makefile.msvc @ 4901:a0cb7fc23cc2 stable-1.2
Merge of r4868, r4869: SSL minor fixes.
*) SSL: fixed compression workaround to remove all methods.
Previous code used sk_SSL_COMP_delete(ssl_comp_methods, i) while iterating
stack from 0 to n, resulting in removal of only even compression methods.
In real life this change is a nop, as there is only one compression method
which is enabled by default in OpenSSL.
*) SSL: added version checks for ssl compression workaround.
The SSL_COMP_get_compression_methods() is only available as an API
function in OpenSSL 0.9.8+, require it explicitly to unbreak build
with OpenSSL 0.9.7.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 12 Nov 2012 18:00:32 +0000 |
| parents | d620f497c50f |
| children |
| rev | line source |
|---|---|
| 653 | 1 |
| 2 # Copyright (C) Igor Sysoev | |
| 4412 | 3 # Copyright (C) Nginx, Inc. |
| 653 | 4 |
| 5 | |
| 6 CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN | |
| 7 | |
| 675 | 8 !IF "$(SHA1_ASM)" == "YES" |
| 653 | 9 |
| 10 sha1.lib: | |
|
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
675
diff
changeset
|
11 cd $(SHA1) |
| 653 | 12 cl -c $(CFLAGS) -D SHA1_ASM sha1dgst.c |
| 13 link -lib -out:sha1.lib sha1dgst.obj asm/s-win32.obj | |
| 14 | |
| 675 | 15 !ELSE |
| 653 | 16 |
| 17 sha1.lib: | |
|
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
675
diff
changeset
|
18 cd $(SHA1) |
| 653 | 19 cl -c $(CFLAGS) sha1dgst.c |
| 20 link -lib -out:sha1.lib sha1dgst.obj | |
| 21 | |
| 675 | 22 !ENDIF |