[SCM] GNU gnutls branch, new, updated. gnutls_2_9_10-33-g168df8b

[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=168df8bf5f8a58d2f2e4ee4a9616007c2f7ef232

The branch, new has been updated
       via  168df8bf5f8a58d2f2e4ee4a9616007c2f7ef232 (commit)
      from  c26b2f429153686c1241f5ca45c8cb66b9e76f0f (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 168df8bf5f8a58d2f2e4ee4a9616007c2f7ef232
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat May 15 22:10:42 2010 +0200

    Deprecated the sign callback.

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

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

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 23cec74..5cae317 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -3,6 +3,20 @@
 #ifndef _GNUTLS_COMPAT_H
 # define _GNUTLS_COMPAT_H
 
+#ifdef __GNUC__
+
+#define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + 
__GNUC_PATCHLEVEL__)
+
+#if _GNUTLS_GCC_VERSION >= 30100
+#define _GNUTLS_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#endif /* __GNUC__ */
+
+#ifndef _GNUTLS_GCC_ATTR_DEPRECATED
+#define _GNUTLS_GCC_ATTR_DEPRECATED
+#endif
+
 #define gnutls_cipher_algorithm gnutls_cipher_algorithm_t
 #define gnutls_kx_algorithm gnutls_kx_algorithm_t
 #define gnutls_paramsype gnutls_paramsype_t
@@ -133,9 +147,22 @@ typedef int gnutls_certificate_server_retrieve_function 
(gnutls_session_t,
 
 void gnutls_certificate_client_set_retrieve_function
     (gnutls_certificate_credentials_t cred,
-     gnutls_certificate_client_retrieve_function * func);
+     gnutls_certificate_client_retrieve_function * func) 
_GNUTLS_GCC_ATTR_DEPRECATED;
 void gnutls_certificate_server_set_retrieve_function
     (gnutls_certificate_credentials_t cred,
-     gnutls_certificate_server_retrieve_function * func);
+     gnutls_certificate_server_retrieve_function * func) 
_GNUTLS_GCC_ATTR_DEPRECATED;
+
+  /* External signing callback.  Experimental. */
+  typedef int (*gnutls_sign_func) (gnutls_session_t session,
+                                  void *userdata,
+                                  gnutls_certificate_type_t cert_type,
+                                  const gnutls_datum_t * cert,
+                                  const gnutls_datum_t * hash,
+                                  gnutls_datum_t * signature);
+
+  void gnutls_sign_callback_set (gnutls_session_t session,
+                                gnutls_sign_func sign_func, void *userdata) 
_GNUTLS_GCC_ATTR_DEPRECATED;
+    gnutls_sign_func
+    gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
 
 #endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index df18bc3..2b793b0 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1493,18 +1493,6 @@ extern "C"
 
   /* X509PKI */
 
-  /* External signing callback.  Experimental. */
-  typedef int (*gnutls_sign_func) (gnutls_session_t session,
-                                  void *userdata,
-                                  gnutls_certificate_type_t cert_type,
-                                  const gnutls_datum_t * cert,
-                                  const gnutls_datum_t * hash,
-                                  gnutls_datum_t * signature);
-
-  void gnutls_sign_callback_set (gnutls_session_t session,
-                                gnutls_sign_func sign_func, void *userdata);
-    gnutls_sign_func
-    gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
 
   /* These are set on the credentials structure.
    */


hooks/post-receive
-- 
GNU gnutls