summaryrefslogtreecommitdiff
path: root/libextra
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2004-08-25 13:14:48 +0000
committerSimon Josefsson <simon@josefsson.org>2004-08-25 13:14:48 +0000
commita6e6456ccd8aa59290d998224632ecf56b2fc09f (patch)
tree9a639834cbbaac7598e4cec9a25c2533eb863c88 /libextra
parentf1a6895943c05c0a48a2ebd3772137d9d1ea9ed3 (diff)
downloadgnutls-a6e6456ccd8aa59290d998224632ecf56b2fc09f.tar.gz
Doc fix.
Diffstat (limited to 'libextra')
-rw-r--r--libextra/gnutls_extra.c16
-rw-r--r--libextra/gnutls_openpgp.c13
2 files changed, 22 insertions, 7 deletions
diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c
index f33b671c3f..7865209809 100644
--- a/libextra/gnutls_extra.c
+++ b/libextra/gnutls_extra.c
@@ -206,12 +206,16 @@ static const char *parse_version_string(const char *s, int *major,
return s; /* patchlevel */
}
-/****************
- * Check that the version of the library is at minimum the requested one
- * and return the version string; return NULL if the condition is not
- * satisfied. If a NULL is passed to this function, no check is done,
- * but the version string is simply returned.
- */
+/**
+ * gnutls_extra_check_version - This function checks the library's version
+ * @req_version: the version to check
+ *
+ * Check that the version of the gnutls-extra library is at minimum
+ * the requested one and return the version string; return NULL if the
+ * condition is not satisfied. If a NULL is passed to this function,
+ * no check is done, but the version string is simply returned.
+ *
+ **/
const char *gnutls_extra_check_version(const char *req_version)
{
const char *ver = VERSION;
diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index b997b0c3a6..d6f0464e1e 100644
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -840,7 +840,18 @@ gnutls_certificate_set_openpgp_keyring_file(gnutls_certificate_credentials_t c,
return gnutls_openpgp_add_keyring_file(&c->keyring, file);
}
-
+/**
+ * gnutls_certificate_set_openpgp_keyring_mem - Add keyring data for OpenPGP
+ * @c: A certificate credentials structure
+ * @data: buffer with keyring data.
+ * @dlen: length of data buffer.
+ *
+ * The function is used to set keyrings that will be used internally
+ * by various OpenPGP functions. For example to find a key when it
+ * is needed for an operations. The keyring will also be used at the
+ * verification functions.
+ *
+ **/
int
gnutls_certificate_set_openpgp_keyring_mem(gnutls_certificate_credentials_t c,
const opaque * data,