[SCM] GNU gnutls branch, master, updated. gnutls_2_11_4-8-g1d6c1b0

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=1d6c1b025e6bb2c44541693559622e657b98c294

The branch, master has been updated
       via  1d6c1b025e6bb2c44541693559622e657b98c294 (commit)
      from  c3e141ad51683f2af117c3082721b34f09b2d40f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d6c1b025e6bb2c44541693559622e657b98c294
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Nov 4 16:37:44 2010 +0100

    Deprecated old functions.

-----------------------------------------------------------------------

Summary of changes:
 lib/includes/gnutls/compat.h    |   21 +++++++++++++++++++--
 lib/includes/gnutls/gnutls.h.in |   15 ---------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index ee038c7..da2bba9 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -170,11 +170,28 @@ gnutls_sign_callback_set (gnutls_session_t session,
 gnutls_sign_func
 gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
 
-     int gnutls_ext_register (int type,
+int gnutls_ext_register (int type,
                              const char *name,
                              gnutls_ext_parse_type_t parse_type,
                              gnutls_ext_recv_func recv_func,
                              gnutls_ext_send_func send_func)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
+_GNUTLS_GCC_ATTR_DEPRECATED;
+
+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;
+
+/* returns security values. 
+ * Do not use them unless you know what you're doing. Those are dangerous since
+ * they depend on a particular TLS version number
+ */
+#define GNUTLS_MASTER_SIZE 48
+#define GNUTLS_RANDOM_SIZE 32
+const void *gnutls_session_get_server_random (gnutls_session_t session) 
_GNUTLS_GCC_ATTR_DEPRECATED;
+const void *gnutls_session_get_client_random (gnutls_session_t session) 
_GNUTLS_GCC_ATTR_DEPRECATED;
+const void *gnutls_session_get_master_secret (gnutls_session_t session) 
_GNUTLS_GCC_ATTR_DEPRECATED;
 
 #endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 9354100..4efc97a 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -931,21 +931,6 @@ extern "C"
   int gnutls_session_get_id (gnutls_session_t session, void *session_id,
                             size_t * session_id_size);
 
-/* returns security values. 
- * Do not use them unless you know what you're doing.
- */
-#define GNUTLS_MASTER_SIZE 48
-#define GNUTLS_RANDOM_SIZE 32
-  const void *gnutls_session_get_server_random (gnutls_session_t session);
-  const void *gnutls_session_get_client_random (gnutls_session_t session);
-  const void *gnutls_session_get_master_secret (gnutls_session_t session);
-
-  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);
 
   int gnutls_session_channel_binding (gnutls_session_t session,
                                      gnutls_channel_binding_t cbtype,


hooks/post-receive
-- 
GNU gnutls