summaryrefslogtreecommitdiff
path: root/lib/tpm.c
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2012-09-21 00:57:30 +0200
committerSimon Josefsson <simon@josefsson.org>2012-09-21 01:03:06 +0200
commit920a7aa76258583d1ba9b9c1d21f167e01647460 (patch)
tree148ea61dd6a12fdf36a63fa67b3c8ebdf9e67f83 /lib/tpm.c
parent7feebc365756ee1e8d98db1d1b1728ec96c6e688 (diff)
downloadgnutls-920a7aa76258583d1ba9b9c1d21f167e01647460.tar.gz
Fix GTK-DOC warnings.
Diffstat (limited to 'lib/tpm.c')
-rw-r--r--lib/tpm.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/tpm.c b/lib/tpm.c
index 47f0466a18..848cf9657f 100644
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -1052,19 +1052,18 @@ int ret;
* @fdata: The TPM key to be imported
* @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: One of the %GNUTLS_PUBKEY flags
*
- * This function will import the public key from the provided
- * TPM key structure.
+ * This function will import the public key from the provided TPM key
+ * structure.
*
- * With respect to passwords the same as in gnutls_pubkey_import_tpm_url() apply.
+ * With respect to passwords the same as in
+ * gnutls_pubkey_import_tpm_url() apply.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
* Since: 3.1.0
- *
**/
int
gnutls_pubkey_import_tpm_raw (gnutls_pubkey_t pkey,
@@ -1469,9 +1468,6 @@ err_cc:
*
* This function will deinitialize the list of stored keys in the TPM.
*
- * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- * negative error value.
- *
* Since: 3.1.0
**/
void
@@ -1510,7 +1506,6 @@ gnutls_tpm_key_list_get_url (gnutls_tpm_key_list_t list, unsigned int idx, char*
/**
* gnutls_tpm_get_registered:
* @list: a list to store the keys
- * @srk_password: a password to protect the exported key (optional)
*
* This function will get a list of stored keys in the TPM. The uuid
* of those keys