Skip to content

Commit

Permalink
Internal md5 and sha1 implementations are now always used.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mdounin committed Jun 30, 2016
1 parent fb6c764 commit c60b61a
Show file tree
Hide file tree
Showing 26 changed files with 39 additions and 664 deletions.
1 change: 0 additions & 1 deletion auto/cc/acc
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ CC_TEST_FLAGS="-Ae"

PCRE_OPT="$PCRE_OPT -Ae"
ZLIB_OPT="$ZLIB_OPT -Ae"
MD5_OPT="$MD5_OPT -Ae"
6 changes: 0 additions & 6 deletions auto/cc/clang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions auto/cc/gcc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions auto/cc/icc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions auto/cc/sunc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 0 additions & 29 deletions auto/lib/conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,6 @@ if [ $USE_OPENSSL = YES ]; then
. auto/lib/openssl/conf
fi

if [ $USE_MD5 = YES ]; then

if [ $USE_OPENSSL = YES ]; then
have=NGX_HAVE_OPENSSL_MD5_H . auto/have
have=NGX_OPENSSL_MD5 . auto/have
have=NGX_HAVE_MD5 . auto/have
MD5=YES
MD5_LIB=OpenSSL

else
. auto/lib/md5/conf
fi

fi

if [ $USE_SHA1 = YES ]; then

if [ $USE_OPENSSL = YES ]; then
have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
have=NGX_HAVE_SHA1 . auto/have
SHA1=YES
SHA1_LIB=OpenSSL

else
. auto/lib/sha1/conf
fi

fi

if [ $USE_ZLIB = YES ]; then
. auto/lib/zlib/conf
fi
Expand Down
8 changes: 0 additions & 8 deletions auto/lib/make
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ if [ $PCRE != NONE -a $PCRE != NO -a $PCRE != YES ]; then
. auto/lib/pcre/make
fi

if [ $MD5 != NONE -a $MD5 != NO -a $MD5 != YES ]; then
. auto/lib/md5/make
fi

if [ $SHA1 != NONE -a $SHA1 != NO -a $SHA1 != YES ]; then
. auto/lib/sha1/make
fi

if [ $OPENSSL != NONE -a $OPENSSL != NO -a $OPENSSL != YES ]; then
. auto/lib/openssl/make
fi
Expand Down
103 changes: 0 additions & 103 deletions auto/lib/md5/conf

This file was deleted.

96 changes: 0 additions & 96 deletions auto/lib/md5/make

This file was deleted.

22 changes: 0 additions & 22 deletions auto/lib/md5/makefile.bcc

This file was deleted.

22 changes: 0 additions & 22 deletions auto/lib/md5/makefile.msvc

This file was deleted.

11 changes: 0 additions & 11 deletions auto/lib/md5/makefile.owc

This file was deleted.

Loading

0 comments on commit c60b61a

Please sign in to comment.