GnuTLS now uses gnutls_session_set_premaster()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/configure.ac b/configure.ac
index c1bb531..c74b8b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -201,8 +201,8 @@ if test "$with_gnutls" = "yes" || test "$with_gnutls" = "shibboleet"; then
     LIBS="$LIBS $GNUTLS_LIBS"
     AC_CHECK_FUNC(gnutls_pkcs12_simple_parse,
                 [AC_DEFINE(HAVE_GNUTLS_PKCS12_SIMPLE_PARSE, 1)], [])
-    AC_CHECK_FUNC(gnutls_session_set_master,
-                [AC_DEFINE(HAVE_GNUTLS_SESSION_SET_MASTER, 1)], [])
+    AC_CHECK_FUNC(gnutls_session_set_premaster,
+                [AC_DEFINE(HAVE_GNUTLS_SESSION_SET_PREMASTER, 1)], [])
     LIBS="$oldLIBS"
 elif test "$with_gnutls" != "" && test "$with_gnutls" != "no"; then
     AC_MSG_ERROR([Values other than 'yes' or 'no' for --with-gnutls are not supported])

diff --git a/dtls.c b/dtls.c
index e29eaae..2e60a3f 100644 (file)
--- a/dtls.c
+++ b/dtls.c
@@ -356,10 +356,10 @@ static int start_dtls_handshake(struct openconnect_info *vpninfo, int dtls_fd)
        master_secret.size = sizeof(vpninfo->dtls_secret);
        session_id.data = vpninfo->dtls_session_id;
        session_id.size = sizeof(vpninfo->dtls_session_id);
-       err = gnutls_session_set_master(dtls_ssl, GNUTLS_CLIENT, GNUTLS_DTLS0_9,
-                                       GNUTLS_KX_RSA, GNUTLS_CIPHER_AES_128_CBC,
-                                       GNUTLS_MAC_SHA1, GNUTLS_COMP_NULL,
-                                       &master_secret, &session_id);
+       err = gnutls_session_set_premaster(dtls_ssl, GNUTLS_CLIENT, GNUTLS_DTLS0_9,
+                                          GNUTLS_KX_RSA, GNUTLS_CIPHER_AES_128_CBC,
+                                          GNUTLS_MAC_SHA1, GNUTLS_COMP_NULL,
+                                          &master_secret, &session_id);
        if (err) {
                vpn_progress(vpninfo, PRG_ERR,
                             _("Failed to set DTLS session parameters: %s\n"),

diff --git a/openconnect-internal.h b/openconnect-internal.h
index e8d22f2..0235c33 100644 (file)
--- a/openconnect-internal.h
+++ b/openconnect-internal.h
@@ -249,7 +249,7 @@ struct openconnect_info {
 };
 
 #if (defined (OPENCONNECT_OPENSSL) && defined (SSL_OP_CISCO_ANYCONNECT)) || \
-    (defined(OPENCONNECT_GNUTLS) && defined (HAVE_GNUTLS_SESSION_SET_MASTER))
+    (defined(OPENCONNECT_GNUTLS) && defined (HAVE_GNUTLS_SESSION_SET_PREMASTER))
 #define HAVE_DTLS 1
 #endif