Branch: Tag:

2015-04-17

2015-04-17 14:48:48 by Martin Nilsson <nilsson@opera.com>

Make Nettle 1.13 (2005-10-06) minimum required verison. This makes MD4, MD2, RC2 and CTR always present.

30:    if test x"$pike_cv_nettle_advapi32_CryptAcquireContext" = xyes; then    LIBS="-ladvapi32 $LIBS"    fi -  AC_CHECK_LIB(nettle, nettle_md5_init) -  AC_CHECK_LIB(nettle, md5_init) +  AC_CHECK_LIB(nettle, nettle_ctr_crypt) dnl CTR came in Nettle 1.13    AC_CHECK_LIB(hogweed, nettle_rsa_generate_keypair)    if test "x$ac_cv_lib_hogweed_nettle_rsa_generate_keypair" = "xyes" ; then    AC_MSG_CHECKING([if nettle_*_generate_keypair takes qbits])
56:       AC_SUBST(IDEA_OBJ)    -  if test "x$ac_cv_lib_nettle_nettle_md5_init" = "xyes" -o \ -  "x$ac_cv_lib_nettle_md5_init" = "xyes"; then +  if test "x$ac_cv_lib_nettle_nettle_ctr_crypt" = "xyes"; then    PIKE_FEATURE_OK(Nettle)    -  # md4 is available in Nettle 1.8 and later. -  # arctwo is available in Nettle 1.11 and later. -  # ctr is available in Nettle 1.13 and later. +     # camellia is available in Nettle 2.1 and later.    # gcm is available in Nettle 2.2 and later.    # ripemd160 is available in Nettle 2.3 and later.    # sha3 and gosthash94 are available in Nettle 2.6 and later.    # chacha, poly1305 and eax are available in Nettle 3.0 and later. -  AC_CHECK_HEADERS(nettle/md4.h \ -  nettle/arctwo.h \ -  nettle/ctr.h \ -  nettle/camellia.h \ +  AC_CHECK_HEADERS(nettle/camellia.h \    nettle/gcm.h \    nettle/ripemd160.h \    nettle/sha3.h nettle/gosthash94.h \
79:    nettle/poly1305.h nettle/eax.h \    nettle/dsa.h nettle/umac.h nettle/ecdsa.h \    ) -  AC_CHECK_FUNCS(nettle_md4_init) +        AC_MSG_CHECKING([for idea.c])    # Have the patent-encumbered idea files been purged?
129:    fi    else    AC_ERROR([Cannot compile --with-nettle without the Nettle library. - It is highly recommended that you install a working Nettle library on - your system as that will add features to Pike required by many - applications. These features include ciphers, hash algorithms and - random generators. If you know that you do not need cryptographic - functions, you can re-run configure with the option --without-nettle - instead. Nettle is available at http://www.lysator.liu.se/~nisse/nettle/. + It is highly recommended that you install a working Nettle, 1.13 or + later, library on your system as that will add features to Pike + required by many applications. These features include ciphers, hash + algorithms and random generators. If you know that you do not need + cryptographic functions, you can re-run configure with the option + --without-nettle instead. Nettle is available at + http://www.lysator.liu.se/~nisse/nettle/.    ])    PIKE_FEATURE_NODEP(Nettle)    fi   fi      AC_OUTPUT(Makefile,echo FOO >stamp-h )