diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-06-30 18:57:39 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-06-30 18:57:39 +0300 |
| commit | c60b61a290960c1411d4da34d7f9265a43fd831b (patch) | |
| tree | a9b68ca1d34e2c2399adc243f9b8274f718d1694 /auto/cc | |
| parent | fb6c764921dff3322b33ed2f5169b4c23f84bd9c (diff) | |
| download | nginx-c60b61a290960c1411d4da34d7f9265a43fd831b.tar.gz nginx-c60b61a290960c1411d4da34d7f9265a43fd831b.tar.bz2 | |
Internal md5 and sha1 implementations are now always used.
This reduces the number of moving parts in ABI compatibility checks.
Additionally, it also allows to use OpenSSL in FIPS mode while still
using md5 for non-security tasks.
Diffstat (limited to 'auto/cc')
| -rw-r--r-- | auto/cc/acc | 1 | ||||
| -rw-r--r-- | auto/cc/clang | 6 | ||||
| -rw-r--r-- | auto/cc/gcc | 6 | ||||
| -rw-r--r-- | auto/cc/icc | 4 | ||||
| -rw-r--r-- | auto/cc/sunc | 4 |
5 files changed, 0 insertions, 21 deletions
diff --git a/auto/cc/acc b/auto/cc/acc index 6baee672a..64fa6719b 100644 --- a/auto/cc/acc +++ b/auto/cc/acc @@ -12,4 +12,3 @@ CC_TEST_FLAGS="-Ae" PCRE_OPT="$PCRE_OPT -Ae" ZLIB_OPT="$ZLIB_OPT -Ae" -MD5_OPT="$MD5_OPT -Ae" diff --git a/auto/cc/clang b/auto/cc/clang index 25707b42d..19bdaaaa0 100644 --- a/auto/cc/clang +++ b/auto/cc/clang @@ -66,12 +66,6 @@ else PCRE_OPT="$PCRE_OPT -pipe" fi -if [ ".$MD5_OPT" = "." ]; then - MD5_OPT="-O2 -pipe $CPU_OPT" -else - MD5_OPT="$MD5_OPT -pipe" -fi - if [ ".$ZLIB_OPT" = "." ]; then ZLIB_OPT="-O2 -pipe $CPU_OPT" else diff --git a/auto/cc/gcc b/auto/cc/gcc index 5f93ca392..a5c5c18fb 100644 --- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -128,12 +128,6 @@ else PCRE_OPT="$PCRE_OPT $PIPE" fi -if [ ".$MD5_OPT" = "." ]; then - MD5_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" -else - MD5_OPT="$MD5_OPT $PIPE" -fi - if [ ".$ZLIB_OPT" = "." ]; then ZLIB_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" else diff --git a/auto/cc/icc b/auto/cc/icc index 1c0df1a99..c47f6e4b4 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -43,10 +43,6 @@ if [ ".$PCRE_OPT" = "." ]; then PCRE_OPT="-O $CPU_OPT" fi -if [ ".$MD5_OPT" = "." ]; then - MD5_OPT="-O $CPU_OPT" -fi - if [ ".$ZLIB_OPT" = "." ]; then ZLIB_OPT="-O $CPU_OPT" fi diff --git a/auto/cc/sunc b/auto/cc/sunc index 8360c49c2..226ef5ea6 100644 --- a/auto/cc/sunc +++ b/auto/cc/sunc @@ -145,10 +145,6 @@ if [ ".$PCRE_OPT" = "." ]; then PCRE_OPT="$ngx_fast $IPO $CPU_OPT" fi -if [ ".$MD5_OPT" = "." ]; then - MD5_OPT="$ngx_fast $IPO $CPU_OPT" -fi - if [ ".$ZLIB_OPT" = "." ]; then ZLIB_OPT="$ngx_fast $IPO $CPU_OPT" fi |