Commit 360dfd98 authored by Niels Möller's avatar Niels Möller

Skip GMP tests if public key support is disabled.

parent f8aa12d5
2014-04-11 Niels Möller <nisse@lysator.liu.se> 2014-04-11 Niels Möller <nisse@lysator.liu.se>
* configure.ac: Skip GMP tests if public key support is disabled.
* eax.c (block16_xor): Fixed bug effecting 32-bit platforms. * eax.c (block16_xor): Fixed bug effecting 32-bit platforms.
* Makefile.in (DISTFILES): Deleted memxor.c, already included via * Makefile.in (DISTFILES): Deleted memxor.c, already included via
......
...@@ -673,31 +673,35 @@ if test "x$nettle_cv_fcntl_locking" = "xyes" ; then ...@@ -673,31 +673,35 @@ if test "x$nettle_cv_fcntl_locking" = "xyes" ; then
fi fi
# Checks for libraries # Checks for libraries
AC_CHECK_LIB(gmp, __gmpz_getlimbn,, if test "x$enable_public_key" = "xyes" ; then
[AC_MSG_WARN( AC_CHECK_LIB(gmp, __gmpz_getlimbn,,
[GNU MP not found, or not 3.1 or up, see http://gmplib.org/. [AC_MSG_WARN(
Support for public key algorithms will be unavailable.])] [GNU MP not found, or not 3.1 or up, see http://gmplib.org/.
enable_public_key=no) Support for public key algorithms will be unavailable.])]
enable_public_key=no)
# Add -R flags needed to run programs linked with gmp
LSH_RPATH_FIX # Add -R flags needed to run programs linked with gmp
LSH_RPATH_FIX
# Check for gmp limb size
nettle_cv_gmp_numb_bits=0
if test "$enable_public_key" = yes; then
AC_MSG_CHECKING([for GMP limb size])
AC_COMPUTE_INT(nettle_cv_gmp_numb_bits, [GMP_NUMB_BITS],
[#include <gmp.h>],
[AC_MSG_FAILURE([cannot find value of GMP_NUMB_BITS])])
AC_MSG_RESULT([$nettle_cv_gmp_numb_bits bits])
fi fi
GMP_NUMB_BITS="$nettle_cv_gmp_numb_bits" if test "x$enable_public_key" = "xyes" ; then
AC_SUBST([GMP_NUMB_BITS]) # Check for gmp limb size
nettle_cv_gmp_numb_bits=0
AH_TEMPLATE([HAVE_MPZ_POWM_SEC], [Define if mpz_powm_sec is available (appeared in GMP-5)]) if test "$enable_public_key" = yes; then
AC_CHECK_FUNC(__gmpz_powm_sec, [AC_DEFINE(HAVE_MPZ_POWM_SEC)]) AC_MSG_CHECKING([for GMP limb size])
AC_COMPUTE_INT(nettle_cv_gmp_numb_bits, [GMP_NUMB_BITS],
[#include <gmp.h>],
[AC_MSG_FAILURE([cannot find value of GMP_NUMB_BITS])])
AC_MSG_RESULT([$nettle_cv_gmp_numb_bits bits])
fi
GMP_NUMB_BITS="$nettle_cv_gmp_numb_bits"
AC_SUBST([GMP_NUMB_BITS])
AH_TEMPLATE([HAVE_MPZ_POWM_SEC], [Define if mpz_powm_sec is available (appeared in GMP-5)])
AC_CHECK_FUNC(__gmpz_powm_sec, [AC_DEFINE(HAVE_MPZ_POWM_SEC)])
fi
AH_TEMPLATE([WITH_HOGWEED], [Defined if public key features are enabled]) AH_TEMPLATE([WITH_HOGWEED], [Defined if public key features are enabled])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment