gnutls_x509_privkey_sign_hash() is dangerous and was deprecated. Added some text...

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 7804214576d6827263183728985a985d858d50d7..635cfbf9218aae621a817862e60b8255ca4b8e03 100644 (file)
--- 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 80cd7db22d53be6d250a25b53dae557ec8cfa7b0..80bb435999fa6be183a0246ab5a0ae2e660169ff 100644 (file)
--- 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.