summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2011-02-20 19:07:51 +0100
committerSimon Josefsson <simon@josefsson.org>2011-02-20 19:07:51 +0100
commit0d1c720e2d0fb1fa66fbc7b6fa1da4da5cae0867 (patch)
tree1e0379e1ea4dae407739683e7fbc4738848f58e0
parent4b8db2d896f96d4ba4faf015cd357835eef8696f (diff)
downloadgnutls-0d1c720e2d0fb1fa66fbc7b6fa1da4da5cae0867.tar.gz
Fix docstring of deprecated functions.
-rw-r--r--lib/gnutls_cert.c12
-rw-r--r--lib/gnutls_extensions.c6
-rw-r--r--lib/gnutls_privkey.c2
-rw-r--r--lib/x509/privkey.c14
4 files changed, 18 insertions, 16 deletions
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index ab6831f216..68641b1160 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -984,7 +984,7 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
_gnutls_free_datum (&cert->raw);
}
-/*-
+/**
* gnutls_sign_callback_set:
* @session: is a gnutls session
* @sign_func: function pointer to application's sign callback.
@@ -1003,8 +1003,8 @@ _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.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
void
gnutls_sign_callback_set (gnutls_session_t session,
gnutls_sign_func sign_func, void *userdata)
@@ -1013,7 +1013,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.
@@ -1023,8 +1023,8 @@ 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.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
gnutls_sign_func
gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
{
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index bf474ec84a..54c5b4f972 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -396,7 +396,7 @@ _gnutls_ext_register (extension_entry_st * mod)
return GNUTLS_E_SUCCESS;
}
-/*-
+/**
* gnutls_ext_register:
* @type: the 16-bit integer referring to the extension type
* @name: human printable name of the extension used for debugging
@@ -408,8 +408,8 @@ _gnutls_ext_register (extension_entry_st * mod)
*
* Returns: %GNUTLS_E_SUCCESS on success, or an error code.
*
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
int
gnutls_ext_register (int type,
const char *name,
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 6b930d7fe7..2d1392ed24 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -404,7 +404,7 @@ int ret;
#endif
/**
- * gnutls_privkey_sign_data:
+ * gnutls_privkey_sign_data2:
* @signer: Holds the key
* @digest: should be a digest algorithm
* @flags: should be 0 for now
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index c322934e13..0391ee4df8 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1718,8 +1718,8 @@ cleanup:
return ret;
}
-/*-
- * _gnutls_x509_privkey_sign_hash:
+/**
+ * gnutls_x509_privkey_sign_hash:
* @key: Holds the key
* @hash: holds the data to be signed
* @signature: will contain newly allocated signature
@@ -1732,8 +1732,8 @@ cleanup:
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
*
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
int
gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
const gnutls_datum_t * hash,
@@ -1758,7 +1758,7 @@ gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
return 0;
}
-/*-
+/**
* gnutls_x509_privkey_sign_data:
* @key: Holds the key
* @digest: should be MD5 or SHA1
@@ -1782,7 +1782,9 @@ gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
- -*/
+ *
+ * Deprecated: 2.12.0
+ */
int
gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
gnutls_digest_algorithm_t digest,