Sync with gnutls_supplemental.c.

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 79b2db4f9ee16c07b5be4b64bb47a52d46b6a6f0..6151a2938ee2aa5a432bbb6d8af04d2322632220 100644 (file)
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2097,20 +2097,19 @@ _gnutls_send_supplemental (gnutls_session_t session, int again)
                                  GNUTLS_HANDSHAKE_SUPPLEMENTAL);
   else
     {
-      gnutls_buffer *buf = &session->security_parameters.extensions.supp_data;
+      gnutls_buffer buf;
+      _gnutls_buffer_init (&buf);
 
-      _gnutls_buffer_init (buf);
-
-      ret = _gnutls_gen_supplemental (session);
+      ret = _gnutls_gen_supplemental (session, &buf);
       if (ret < 0)
        {
          gnutls_assert ();
          return ret;
        }
 
-      ret = _gnutls_send_handshake (session, buf->data, buf->length,
+      ret = _gnutls_send_handshake (session, buf.data, buf.length,
                                    GNUTLS_HANDSHAKE_SUPPLEMENTAL);
-      _gnutls_buffer_clear (buf);
+      _gnutls_buffer_clear (&buf);
     }
 
   return ret;

diff --git a/lib/gnutls_supplemental.h b/lib/gnutls_supplemental.h
index 32bd6174c8cfcaf8a7641a0ba84a305f3b2fdda7..0b9c1207cf1048416a9fab7ab7cc0725d61f51f4 100644 (file)
--- a/lib/gnutls_supplemental.h
+++ b/lib/gnutls_supplemental.h
@@ -27,9 +27,5 @@
 int _gnutls_parse_supplemental (gnutls_session_t session,
                                const uint8_t *data,
                                int data_size);
-int _gnutls_gen_supplemental (gnutls_session_t session);
-
-typedef int (*supp_recv_func) (gnutls_session_t session,
-                              const opaque *data,
-                              size_t data_size);
-typedef int (*supp_send_func) (gnutls_session_t session);
+int _gnutls_gen_supplemental (gnutls_session_t session,
+                             gnutls_buffer *buf);