diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | m4/hooks.m4 | 12 | ||||
| -rw-r--r-- | tests/cert-tests/Makefile.am | 4 |
3 files changed, 5 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 74822e27ad..def64b5009 100644 --- a/configure.ac +++ b/configure.ac @@ -477,13 +477,6 @@ fi PKG_CHECK_MODULES(CMOCKA, [cmocka >= 1.0.1], [with_cmocka=yes], [with_cmocka=no]) AM_CONDITIONAL(HAVE_CMOCKA, test "$with_cmocka" != "no") -with_old_nettle=no -if ! $PKG_CONFIG --atleast-version=3.3 nettle; then - with_old_nettle=yes -fi -AM_CONDITIONAL(WITH_OLD_NETTLE, test "$with_old_nettle" != "no") - - AC_ARG_WITH(idn, AS_HELP_STRING([--without-idn], [disable support for IDNA]), try_libidn2="$withval", diff --git a/m4/hooks.m4 b/m4/hooks.m4 index 469748155d..aef186d932 100644 --- a/m4/hooks.m4 +++ b/m4/hooks.m4 @@ -14,10 +14,8 @@ # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # -# You should have received a copy of the GNU Lesser General Public -# License along with GnuTLS; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/> AC_DEFUN([LIBGNUTLS_EXTRA_HOOKS], [ @@ -70,13 +68,13 @@ AC_DEFUN([LIBGNUTLS_HOOKS], DLL_SSL_VERSION=`expr ${LT_SSL_CURRENT} - ${LT_SSL_AGE}` AC_SUBST(DLL_SSL_VERSION) - PKG_CHECK_MODULES(NETTLE, [nettle >= 3.1], [cryptolib="nettle"], [ + PKG_CHECK_MODULES(NETTLE, [nettle >= 3.3], [cryptolib="nettle"], [ AC_MSG_ERROR([[ *** - *** Libnettle 3.1 was not found. + *** Libnettle 3.3 was not found. ]]) ]) - PKG_CHECK_MODULES(HOGWEED, [hogweed >= 3.1], [], [ + PKG_CHECK_MODULES(HOGWEED, [hogweed >= 3.3], [], [ AC_MSG_ERROR([[ *** *** Libhogweed (nettle's companion library) was not found. Note that you must compile nettle with gmp support. diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am index 6649838104..d0b1bb21c3 100644 --- a/tests/cert-tests/Makefile.am +++ b/tests/cert-tests/Makefile.am @@ -109,10 +109,6 @@ if WANT_TEST_SUITE dist_check_SCRIPTS += provable-dh-default endif -if !WITH_OLD_NETTLE -dist_check_SCRIPTS += illegal-rsa -endif - if !WINDOWS dist_check_SCRIPTS += template-test pem-decoding othername-test krb5-test sha3-test md5-test \ tlsfeature-test template-exts-test pkcs1-pad pkcs12-utf8 rsa-pss-pad dsa |