diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-03-01 16:38:29 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-03-01 16:38:31 +0100 |
| commit | 803f2e10748995c6386bb54cad4ceaca6bd1c1b3 (patch) | |
| tree | 9ce9bd3265836c4fd8e56dcbda7fe01e38329913 | |
| parent | 70213445fe3add019f2cff2669fd2439581922f1 (diff) | |
| download | gnutls-803f2e10748995c6386bb54cad4ceaca6bd1c1b3.tar.gz | |
configure: simplified nettle version check
Relates #401
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | lib/nettle/Makefile.am | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index def64b5009..18be369534 100644 --- a/configure.ac +++ b/configure.ac @@ -522,13 +522,7 @@ if test "$enable_non_suiteb" = "yes";then fi AM_CONDITIONAL(ENABLE_NON_SUITEB_CURVES, test "$enable_non_suiteb" = "yes") -dnl nettle_rsa_pss_* are only available in the development version of nettle -AC_CHECK_LIB(hogweed, nettle_rsa_pss_sha256_verify_digest, have_nettle_rsa_pss=yes, have_nettle_rsa_pss=no, [$HOGWEED_LIBS]) - -if test "$have_nettle_rsa_pss" = "yes";then - AC_DEFINE([HAVE_NETTLE_RSA_PSS], 1, [Have nettle_rsa_pss_*]) -fi -AM_CONDITIONAL(HAVE_NETTLE_RSA_PSS, test "$have_nettle_rsa_pss" = "yes") +AM_CONDITIONAL(NETTLE_3_3_API, ! $PKG_CONFIG --atleast-version=3.4 nettle) AC_MSG_CHECKING([whether to build libdane]) AC_ARG_ENABLE(libdane, diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am index 4c044c9f9b..46c0ffecc8 100644 --- a/lib/nettle/Makefile.am +++ b/lib/nettle/Makefile.am @@ -60,7 +60,7 @@ libcrypto_la_SOURCES += rnd-fips.c int/drbg-aes-self-test.c \ int/drbg-aes.c int/drbg-aes.h endif -if !HAVE_NETTLE_RSA_PSS +if NETTLE_3_3_API libcrypto_la_SOURCES += int/pss-mgf1.c int/pss-mgf1.h int/pss.c int/pss.h \ int/rsa-pss.c int/rsa-pss.h \ int/rsa-pss-sha256-sign-tr.c int/rsa-pss-sha256-verify.c \ |