diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-07-18 08:23:01 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-09-11 16:57:05 +0200 |
| commit | e82d150ee1ba5c967dc749ce8a927570b276917d (patch) | |
| tree | ef1c06f2c9a0fa1f9b0b110e86456d847fc3e5b9 | |
| parent | 61c645e3e515ffb2c1d130728be5dc87ad3900fc (diff) | |
| download | gnutls-e82d150ee1ba5c967dc749ce8a927570b276917d.tar.gz | |
require nettle 3.3 or later
This will simplify handling of the x25519 key exchange.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | m4/hooks.m4 | 12 | ||||
| -rw-r--r-- | tests/key-tests/Makefile.am | 6 |
3 files changed, 6 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index f1d3839c58..4c2dd827cb 100644 --- a/configure.ac +++ b/configure.ac @@ -471,13 +471,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 727a6d0c0d..004e0ff848 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/key-tests/Makefile.am b/tests/key-tests/Makefile.am index 90c8f5472e..26230df364 100644 --- a/tests/key-tests/Makefile.am +++ b/tests/key-tests/Makefile.am @@ -37,11 +37,7 @@ EXTRA_DIST = data/key-ca.pem data/key-user.pem \ dist_check_SCRIPTS = key-id pkcs8 pkcs8-decode dsa ecdsa illegal-rsa pkcs8-invalid key-invalid \ pkcs8-eddsa -TESTS = key-id ecdsa pkcs8-invalid key-invalid pkcs8-decode pkcs8 pkcs8-eddsa - -if !WITH_OLD_NETTLE -TESTS += illegal-rsa -endif +TESTS = key-id ecdsa pkcs8-invalid key-invalid pkcs8-decode pkcs8 pkcs8-eddsa illegal-rsa if !WINDOWS TESTS += dsa |