Removed gnutls_session_set_finished_function().

diff --git a/NEWS b/NEWS
index 8a65c36e8b0fbc18507cf1a65ea3da85654c0684..18589a0b36a7b36b1f8a7fe58dbde2a467b0a6cf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ it can verify a certificate chain against a list of certificates.
 ** API and ABI modifications:
 gnutls_cipher_add_auth: ADDED
 gnutls_cipher_tag: ADDED
+gnutls_session_set_finished_function: REMOVED
 gnutls_ext_register: REMOVED
 gnutls_certificate_get_x509_crls: REMOVED
 gnutls_certificate_get_x509_cas: REMOVED

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 7c884c786edfa8ae49fda2070c41356bc68b10b2..de899c2db0844afb4c186dd6d2990a7585ae55a7 100644 (file)
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -712,9 +712,6 @@ _gnutls_send_finished (gnutls_session_t session, int again)
 
       vdata_size = _mbuffer_get_udata_size (bufel);
 
-      if (session->internals.finished_func)
-        session->internals.finished_func (session, data, vdata_size);
-
       ret = _gnutls_ext_sr_finished (session, data, vdata_size, 0);
       if (ret < 0)
         {

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 14e2c0e4dd1c01d6b35f2cdd6bd72ef127218d79..b01dc5c383f105dbd9d9f423b3f4f6213183cded 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -709,9 +709,6 @@ typedef struct
   gnutls_sign_func sign_func;
   void *sign_func_userdata;
 
-  /* Callback to extract TLS Finished message. */
-  gnutls_finished_callback_func finished_func;
-
   /* minimum bits to allow for SRP
    * use gnutls_srp_set_prime_bits() to adjust it.
    */

diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index d3d34d63a4366745e0885e7fedece0dbf7687238..7f463f759b964693027f0316c37e83b6717171e6 100644 (file)
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -1062,39 +1062,6 @@ gnutls_prf (gnutls_session_t session,
   return ret;
 }
 
-/*-
- * gnutls_session_set_finished_function:
- * @session: is a #gnutls_session_t structure.
- * @func: a #gnutls_finished_callback_func callback.
- *
- * Register a callback function for the session that will be called
- * when a TLS Finished message has been generated.  The function is
- * typically used to copy away the TLS finished message for later use
- * as a channel binding or similar purpose.
- *
- * The callback should follow this prototype:
- *
- * void callback (gnutls_session_t @session, const void *@finished, size_t @len);
- *
- * The @finished parameter will contain the binary TLS finished
- * message, and @len will contains its length.  For SSLv3 connections,
- * the @len parameter will be 36 and for TLS connections it will be
- * 12.
- *
- * It is recommended that the function returns quickly in order to not
- * delay the handshake.  Use the function to store a copy of the TLS
- * finished message for later use.
- *
- * Since: 2.6.0
- * Deprecated in: 2.11.0
- -*/
-void
-gnutls_session_set_finished_function (gnutls_session_t session,
-                                      gnutls_finished_callback_func func)
-{
-  session->internals.finished_func = func;
-}
-
 /**
  * gnutls_session_is_resumed:
  * @session: is a #gnutls_session_t structure.

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 78f1e38cdc06d796934833069ee1be9e14257eae..8ea52e09875d19451dadaf2793276250acafcc0d 100644 (file)
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -177,17 +177,6 @@ gnutls_sign_func
 gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
  _GNUTLS_GCC_ATTR_DEPRECATED;
 
-/* We no longer support the finished callback. Use
- * gnutls_session_channel_binding for similar functionality.
- */
-     typedef void (*gnutls_finished_callback_func) (gnutls_session_t session,
-                                                    const void *finished,
-                                                    size_t len);
-     void gnutls_session_set_finished_function (gnutls_session_t session,
-                                                gnutls_finished_callback_func
-                                                func)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
-
      int gnutls_psk_netconf_derive_key (const char *password,
                                         const char *psk_identity,
                                         const char *psk_identity_hint,