summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-02 12:09:03 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-02 12:09:03 +0200
commit235e961082aa428c9fa6201565689b4603ee02db (patch)
treef388f6b67a0e9f58416a879eeef4bfa33f8b90aa
parent70882307b0c5bca40021684d9b424a079aafda70 (diff)
downloadgnutls-235e961082aa428c9fa6201565689b4603ee02db.tar.gz
gnutls_x509_crt_import_url: updated documentation for new function name
-rw-r--r--lib/x509/x509.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index db6197653c..3cccc9ec12 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -3866,15 +3866,13 @@ void gnutls_x509_crt_set_pin_function(gnutls_x509_crt_t crt,
* gnutls_x509_crt_import_url:
* @crt: A certificate of type #gnutls_x509_crt_t
* @url: A PKCS 11 url
- * @flags: One of GNUTLS_PKCS11_OBJ_* flags
+ * @flags: One of GNUTLS_PKCS11_OBJ_* flags for PKCS#11 URLs or zero otherwise
*
- * This function will import a PKCS 11 certificate directly from a token
- * without involving the #gnutls_pkcs11_obj_t type. This function will
- * fail if the certificate stored is not of X.509 type.
+ * This function will import a certificate present in a PKCS#11 token
+ * or any type of back-end that supports URLs.
*
- * Despite its name this function will attempt to import any kind of
- * URL to certificate. In previous versions of gnutls this function
- * was named gnutls_x509_crt_import_pkcs11_url, and the old name is
+ * In previous versions of gnutls this function was named
+ * gnutls_x509_crt_import_pkcs11_url, and the old name is
* an alias to this one.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a