[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-7-ge1dba2a

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

The branch, master has been updated
       via  e1dba2adfeeeffd9e5fb3b50221d971afe49187a (commit)
      from  476403c9700c9925f0f5c049cf1c9826473967b9 (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 e1dba2adfeeeffd9e5fb3b50221d971afe49187a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Dec 9 09:10:33 2010 +0100

    gnutls_x509_privkey_sign_hash() is dangerous and was deprecated. Added some 
text explaining why some functions were deprecated.

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

Summary of changes:
 lib/includes/gnutls/compat.h |   20 +++++++++++++++++++-
 lib/includes/gnutls/x509.h   |    3 ---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 7804214..635cfbf 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -112,6 +112,9 @@
 #define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER
 #define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION
 
+/* The gnutls_retr_st was deprecated by gnutls_certificate_retrieve_function()
+ * and gnutls_retr2_st.
+ */
 typedef struct gnutls_retr_st
 {
   gnutls_certificate_type_t type;
@@ -155,7 +158,8 @@ void
    gnutls_certificate_server_retrieve_function *
    func) _GNUTLS_GCC_ATTR_DEPRECATED;
 
-  /* External signing callback.  Experimental. */
+  /* External signing callback.  No longer supported because it
+   * was deprecated by the PKCS #11 API. */
 typedef int (*gnutls_sign_func) (gnutls_session_t session,
                                 void *userdata,
                                 gnutls_certificate_type_t cert_type,
@@ -170,6 +174,9 @@ gnutls_sign_callback_set (gnutls_session_t session,
 gnutls_sign_func
 gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
 
+/* Extension API is no longer exported because a lot of internal
+ * structures are used.
+ */
      int gnutls_ext_register (int type,
                              const char *name,
                              gnutls_ext_parse_type_t parse_type,
@@ -177,6 +184,9 @@ gnutls_sign_callback_get (gnutls_session_t session, void 
**userdata);
                              gnutls_ext_send_func send_func)
   _GNUTLS_GCC_ATTR_DEPRECATED;
 
+/* We no longer support the finished callback. Use
+ * gnutls_session_channel_binding for similar functionality.
+ */
      typedef void (*gnutls_finished_callback_func) (gnutls_session_t session,
                                                    const void *finished,
                                                    size_t len);
@@ -205,4 +215,12 @@ gnutls_sign_callback_get (gnutls_session_t session, void 
**userdata);
                                        output_key)
   _GNUTLS_GCC_ATTR_DEPRECATED;
 
+/* This is a very dangerous and error-prone function.
+ * Do not use.
+ */
+  int gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
+                                    const gnutls_datum_t * hash,
+                                    gnutls_datum_t * signature)
+                                    _GNUTLS_GCC_ATTR_DEPRECATED;
+
 #endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 80cd7db..80bb435 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -738,9 +738,6 @@ extern "C"
                                            const gnutls_datum_t * signature,
                                            gnutls_digest_algorithm_t * hash);
 
-  int gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
-                                    const gnutls_datum_t * hash,
-                                    gnutls_datum_t * signature);
 
 
 /* Certificate request stuff.


hooks/post-receive
-- 
GNU gnutls