Deprecated old functions.

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index ee038c71dc483be26a07cd6809dcaa2ab05852bb..da2bba9d856e478fc9ea80a4d2e66152ac0e174e 100644 (file)
--- 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 93541003196ac165d07d20a8d8d1def617b28c08..4efc97a1a8e3fb9442c81398ce2e51af543a500a 100644 (file)
--- 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,