Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Build ESP and DTLS unconditionally with GnuTLS
We don't support any verions of GnuTLS that can't do these, any more.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
dwmw2 committed Aug 14, 2017
1 parent 324b88d commit 5f0eb81
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions configure.ac
Expand Up @@ -450,8 +450,8 @@ case "$ssl_library" in
oldcflags="$CFLAGS"
LIBS="$LIBS $GNUTLS_LIBS"
CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
AC_CHECK_FUNC(gnutls_cipher_set_iv,
[esp=yes], [])
esp=yes
dtls=yes
AC_CHECK_FUNC(gnutls_pkcs12_simple_parse,
[AC_DEFINE(HAVE_GNUTLS_PKCS12_SIMPLE_PARSE, 1, [From GnuTLS 3.1.0])], [])
AC_CHECK_FUNC(gnutls_certificate_set_key,
Expand All @@ -466,8 +466,6 @@ case "$ssl_library" in
[AC_DEFINE(HAVE_GNUTLS_URL_IS_SUPPORTED, 1, [From GnuTLS 3.1.0])], [])
AC_CHECK_FUNC(gnutls_system_key_add_x509,
[AC_DEFINE(HAVE_GNUTLS_SYSTEM_KEYS, 1, [From GnuTLS 3.4.0])], [])
AC_CHECK_FUNC(gnutls_session_set_premaster,
[dtls=yes], [])
AC_CHECK_FUNC(gnutls_pkcs11_add_provider,
[PKG_CHECK_MODULES(P11KIT, p11-kit-1,
[AC_DEFINE(HAVE_P11KIT, 1, [Have. P11. Kit.])
Expand Down

0 comments on commit 5f0eb81

Please sign in to comment.