diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2017-10-23 22:25:58 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2017-10-23 22:25:58 +0200 |
| commit | 61460b2e8edda447a40fb1264cb1327114ea61d3 (patch) | |
| tree | 206ba0138631e83f9cfdeab9f5458c286a71801d /configure.ac | |
| parent | 54e1450a0ebdd24cdf6234741e5275bb3d83ebda (diff) | |
| parent | f1366bc97b8cd93f4797ee42fcfafd5584d038df (diff) | |
| download | nettle-61460b2e8edda447a40fb1264cb1327114ea61d3.tar.gz | |
Merge remote-tracking branch 'origin/master' into api-opaque
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 1d1951b5..45ef50e1 100644 --- a/configure.ac +++ b/configure.ac @@ -185,7 +185,7 @@ AC_HEADER_TIME AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(size_t) -AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],, +AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],, [enable_openssl=no break]) @@ -268,7 +268,16 @@ if test "x$enable_public_key" = "xyes" ; then fi fi -GMP_NUMB_BITS="$nettle_cv_gmp_numb_bits" +# Substituted in Makefile, passed on to the eccdata command. +NUMB_BITS="$nettle_cv_gmp_numb_bits" +AC_SUBST([NUMB_BITS]) + +# Substituted in version.h, used only with mini-gmp. +if test "x$enable_mini_gmp" = "xyes" ; then + GMP_NUMB_BITS="$NUMB_BITS" +else + GMP_NUMB_BITS="n/a" +fi AC_SUBST([GMP_NUMB_BITS]) # Figure out ABI. Currently, configurable only by setting CFLAGS. @@ -876,7 +885,7 @@ OPENSSL_LIBFLAGS='' # Check for openssl's libcrypto (used only for benchmarking) if test x$enable_openssl = xyes ; then - AC_CHECK_LIB(crypto, BF_ecb_encrypt, + AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, [OPENSSL_LIBFLAGS='-lcrypto'], [enable_openssl=no]) fi |