Hi,
Mike Frysinger wrote:
> Signed-off-by: Mike Frysinger <vap...@gentoo.org>
> ---
> Makefile | 5 ++++-
> iputils_md5dig.h | 4 +++-
> ping6.c | 19 ++++++++++++++++++-
> 3 files changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index b6cf512..8b9e2aa 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
>
> # Libgcrypt (for MD5) for ping6 [yes|no|static]
> USE_GCRYPT=yes
> -# Crypto library for ping6 [shared|static]
> +# Crypto library for ping6 [shared|static|no]
> USE_CRYPTO=shared
> # Resolv library for ping6 [yes|static]
> USE_RESOLV=yes
> @@ -66,7 +66,10 @@ ifneq ($(USE_GCRYPT),no)
> LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT))
> DEF_CRYPTO = -DUSE_GCRYPT
> else
> +ifneq ($(USE_CRYPTO),no)
> LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
> + DEF_CRYPTO = -DUSE_OPENSSL
> +endif
> endif
>
> # USE_RESOLV: LIB_RESOLV
> diff --git a/iputils_md5dig.h b/iputils_md5dig.h
> index 4cec866..d6c4d46 100644
> --- a/iputils_md5dig.h
> +++ b/iputils_md5dig.h
> @@ -5,8 +5,10 @@
> # include <stdlib.h>
> # include <gcrypt.h>
> # define IPUTILS_MD5DIG_LEN 16
> -#else
> +# define USE_CRYPTO
> +#elif defined(USE_OPENSSL)
> # include <openssl/md5.h>
> +# define USE_CRYPTO
> #endif
>
> #ifdef USE_GCRYPT
Please define ENABLE_NIQUERY (or something else) for
USE_GCRYPT || USE_CRYPTO case and use it in sources.
> diff --git a/ping6.c b/ping6.c
> index 6d1a6db..db7ec4a 100644
> --- a/ping6.c
> +++ b/ping6.c
> @@ -891,6 +899,7 @@ int main(int argc, char *argv[])
> }
> #endif
>
> +#ifdef USE_CRYPTO
> if (niquery_is_enabled()) {
> niquery_init_nonce();
>
Make niquery_is_enabled() returns 0 without ENABLE_NIQUERY
and reduce #ifdefs.
Thank you.
--
Hideaki Yoshifuji <hideaki.yoshif...@miraclelinux.com>
Technical Division, MIRACLE LINUX CORPORATION
