[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-120-g758f9b9

[Simon Josefsson]

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=758f9b91517668524b405261f20bacb17b0c9008

The branch, gnutls_2_12_x has been updated
       via  758f9b91517668524b405261f20bacb17b0c9008 (commit)
       via  b6f5bc5f05a1daae7ecbc260abf67d9b5eda5151 (commit)
      from  ee74170e17016996101668dab5aab84071a6a63a (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 758f9b91517668524b405261f20bacb17b0c9008
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:55:53 2011 +0100

    Fix docstring for deprecated functions.

commit b6f5bc5f05a1daae7ecbc260abf67d9b5eda5151
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:44:15 2011 +0100

    Fix docstring of new function.

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

Summary of changes:
 lib/gnutls_cert.c   |    4 ++--
 lib/gnutls_pubkey.c |   11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 68641b1..72887e5 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -1003,7 +1003,7 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
  * can be used to store application-specific data needed in the
  * callback function.  See also gnutls_sign_callback_get().
  *
- * Deprecated in: 2.12.0
+ * Deprecated: Use the PKCS 11 interfaces instead.
  */
 void
 gnutls_sign_callback_set (gnutls_session_t session,
@@ -1023,7 +1023,7 @@ gnutls_sign_callback_set (gnutls_session_t session,
  * Returns: The function pointer set by gnutls_sign_callback_set(), or
  *   if not set, %NULL.
  *
- * Deprecated in: 2.12.0
+ * Deprecated: Use the PKCS 11 interfaces instead.
  */
 gnutls_sign_func
 gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 17b644c..b4deb73 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -1000,13 +1000,16 @@ gnutls_pubkey_import_dsa_raw (gnutls_pubkey_t key,
  * This function will verify the given signed data, using the
  * parameters from the certificate.
  *
- * Returns: In case of a verification failure %GNUTLS_E_PK_SIG_VERIFY_FAILED 
- * is returned, and a positive code on success.
+ * Returns: In case of a verification failure
+ *   %GNUTLS_E_PK_SIG_VERIFY_FAILED is returned, and a positive code
+ *   on success.
+ *
+ * Since: 2.12.0
  **/
 int
 gnutls_pubkey_verify_data (gnutls_pubkey_t pubkey, unsigned int flags,
-                             const gnutls_datum_t * data,
-                             const gnutls_datum_t * signature)
+                          const gnutls_datum_t * data,
+                          const gnutls_datum_t * signature)
 {
   int ret;
 


hooks/post-receive
-- 
GNU gnutls