[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-80-ge4572a5

[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=e4572a598fbec42adf226ac9ded3fb73cf3d2dc6

The branch, gnutls_2_12_x has been updated
       via  e4572a598fbec42adf226ac9ded3fb73cf3d2dc6 (commit)
      from  7c5c45515e35cb5f33dfb32731ffd404eb0a15b7 (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 e4572a598fbec42adf226ac9ded3fb73cf3d2dc6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Feb 8 22:00:52 2011 +0100

    deprecated the old set_priority functions.

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

Summary of changes:
 lib/includes/gnutls/compat.h    |   18 ++++++++++++++++++
 lib/includes/gnutls/gnutls.h.in |   12 ------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index d0eeae7..da95af8 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -330,4 +330,22 @@ gnutls_sign_callback_get (gnutls_session_t session, void 
**userdata)
   int gnutls_certificate_verify_peers (gnutls_session_t session)
   _GNUTLS_GCC_ATTR_DEPRECATED;
 
+  /* functions to set priority of cipher suites
+   */
+  int gnutls_cipher_set_priority (gnutls_session_t session, const int *list)
+  _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_mac_set_priority (gnutls_session_t session, const int *list)
+  _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_compression_set_priority (gnutls_session_t session,
+                                       const int *list)
+                                       _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_kx_set_priority (gnutls_session_t session, const int *list)
+  _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_protocol_set_priority (gnutls_session_t session,
+                                    const int *list)
+                                    _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_certificate_type_set_priority (gnutls_session_t session,
+                                            const int *list)
+                                            _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 684c5c2..438f3a3 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -873,18 +873,6 @@ extern "C"
   int gnutls_session_ticket_enable_server (gnutls_session_t session,
                                            const gnutls_datum_t * key);
 
-  /* functions to set priority of cipher suites
-   */
-  int gnutls_cipher_set_priority (gnutls_session_t session, const int *list);
-  int gnutls_mac_set_priority (gnutls_session_t session, const int *list);
-  int gnutls_compression_set_priority (gnutls_session_t session,
-                                       const int *list);
-  int gnutls_kx_set_priority (gnutls_session_t session, const int *list);
-  int gnutls_protocol_set_priority (gnutls_session_t session,
-                                    const int *list);
-  int gnutls_certificate_type_set_priority (gnutls_session_t session,
-                                            const int *list);
-
 /* if you just want some defaults, use the following.
  */
   int gnutls_priority_init (gnutls_priority_t * priority_cache,


hooks/post-receive
-- 
GNU gnutls