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 15:40:34 +0200
commit8463e2960825d0e6821caf7fb0cba4819bc89a82 (patch)
tree79dcdf850d19150b8ec9b8cde8917621c8e7962d
parentbf4cc5f0c819d6eaf9d0a4a9bc3c8a2b89a88702 (diff)
downloadgnutls-8463e2960825d0e6821caf7fb0cba4819bc89a82.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 a9e479f76a..4b9c834102 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -3782,15 +3782,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