[SCM] GNU gnutls branch, master, updated. gnutls_3_0_21-88-g458d80a

[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=458d80a1c4f31b4aa27da2c3e3202167dffc2e90

The branch, master has been updated
       via  458d80a1c4f31b4aa27da2c3e3202167dffc2e90 (commit)
      from  75d4058866611ed770509f023077e24a7bad607c (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 458d80a1c4f31b4aa27da2c3e3202167dffc2e90
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Aug 4 22:12:48 2012 +0200

    documentation fixes.

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

Summary of changes:
 lib/gnutls_cert.c    |    8 ++++----
 lib/pkcs11_privkey.c |    2 +-
 lib/tpm.c            |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 01636cc..9be2f03 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -776,7 +776,7 @@ gnutls_certificate_activation_time_peers (gnutls_session_t 
session)
     }
 }
 
-/*-
+/**
  * gnutls_sign_callback_set:
  * @session: is a gnutls session
  * @sign_func: function pointer to application's sign callback.
@@ -796,7 +796,7 @@ gnutls_certificate_activation_time_peers (gnutls_session_t 
session)
  * callback function.  See also gnutls_sign_callback_get().
  *
  * Deprecated: Use the PKCS 11 or #gnutls_privkey_t interfacess like 
gnutls_privkey_import_ext() instead.
- -*/
+ **/
 void
 gnutls_sign_callback_set (gnutls_session_t session,
                           gnutls_sign_func sign_func, void *userdata)
@@ -805,7 +805,7 @@ gnutls_sign_callback_set (gnutls_session_t session,
   session->internals.sign_func_userdata = userdata;
 }
 
-/*-
+/**
  * gnutls_sign_callback_get:
  * @session: is a gnutls session
  * @userdata: if non-%NULL, will be set to abstract callback pointer.
@@ -816,7 +816,7 @@ gnutls_sign_callback_set (gnutls_session_t session,
  *   if not set, %NULL.
  *
  * Deprecated: Use the PKCS 11 interfaces instead.
- -*/
+ **/
 gnutls_sign_func
 gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
 {
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index 5cfb6df..5adee3c 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -638,7 +638,7 @@ cleanup:
 
 /**
  * gnutls_pkcs11_privkey_set_pin_function:
- * @obj: The object structure
+ * @key: The private key
  * @fn: the callback
  * @userdata: data associated with the callback
  *
diff --git a/lib/tpm.c b/lib/tpm.c
index 564c0ac..47f0466 100644
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -562,6 +562,7 @@ out_ctx:
  * @format: The format of the private key
  * @srk_password: The password for the SRK key (optional)
  * @key_password: A password for the key (optional)
+ * @flags: should be zero
  *
  * This function will import the given private key to the abstract
  * #gnutls_privkey_t structure. 


hooks/post-receive
-- 
GNU gnutls