[PATCH] Configure: remove redundant NGX_OPENSSL_MD5

Maxim Dounin mdounin at mdounin.ru
Mon Oct 26 12:50:25 UTC 2015


Hello!

On Sat, Oct 24, 2015 at 04:26:22PM -0700, Piotr Sikora wrote:

> # HG changeset patch
> # User Piotr Sikora <piotrsikora at google.com>
> # Date 1445649693 25200
> #      Fri Oct 23 18:21:33 2015 -0700
> # Node ID 84b5500257121c6bd3e1c0e778cfde8915bf3fcc
> # Parent  7435401242d6dbfdb4b42339ab2d96ed30d397a7
> Configure: remove redundant NGX_OPENSSL_MD5.
> 
> Previously, both NGX_OPENSSL_MD5 and NGX_HAVE_OPENSSL_MD5_H
> had to be defined.
> 
> While there, add missing _H to NGX_HAVE_OPENSSL_MD5.

These macros are destinct.  The NGX_HAVE_OPENSSL_MD5_H means that 
we are using "openssl/md5.h" include.  Second one means that we 
are using OpenSSL-style function names, like "MD5_Init", and not 
RSA-like names like "MD5Init".

Such a distinction may be needed when using external MD5 library 
with --with-md5.

[...]

> diff -r 7435401242d6 -r 84b550025712 auto/lib/md5/conf
> --- a/auto/lib/md5/conf
> +++ b/auto/lib/md5/conf
> @@ -8,8 +8,7 @@ if [ $MD5 != NONE ]; then
>      if grep MD5_Init $MD5/md5.h 2>&1 >/dev/null; then
>          # OpenSSL md5
>          OPENSSL_MD5=YES
> -        have=NGX_HAVE_OPENSSL_MD5 . auto/have
> -        have=NGX_OPENSSL_MD5 . auto/have
> +        have=NGX_HAVE_OPENSSL_MD5_H . auto/have

I don't think this is a typo, rather it tries to define the 
NGX_HAVE_OPENSSL_MD5 macro, currently unused.  Note that it tests 
"md5.h", not "openssl/md5.h".

-- 
Maxim Dounin
http://nginx.org/



More information about the nginx-devel mailing list