From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 21 Feb 2007 16:02:22 +0000 (+0000)
Subject: Sync with gnutls_supplemental.c.
X-Git-Tag: gnutls_1_7_7~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3441e502adf7f72007ec4fcbf01ca85f586b4cb7;p=thirdparty%2Fgnutls.git

Sync with gnutls_supplemental.c.
---

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 79b2db4f9e..6151a2938e 100644
--- 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 32bd6174c8..0b9c1207cf 100644
--- 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);