From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 23 Dec 2014 11:41:35 +0000 (+0200)
Subject: use everywhere the new name of gnutls_x509_crt_import_pkcs11_url
X-Git-Tag: gnutls_3_4_0~438
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc979c2bd48eb0e6f73e19b39251bcc19785abd1;p=thirdparty%2Fgnutls.git

use everywhere the new name of gnutls_x509_crt_import_pkcs11_url
---

diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi
index 0971628c96..06408ebaa1 100644
--- a/doc/cha-tokens.texi
+++ b/doc/cha-tokens.texi
@@ -67,7 +67,7 @@ gnutls_privkey_t abs_key;
   gnutls_privkey_import_url(abs_key, key_url);
 
   gnutls_x509_crt_init(&ca_cert);
-  gnutls_x509_crt_import_pkcs11_url(&ca_cert, cert_url);
+  gnutls_x509_crt_import_url(&ca_cert, cert_url);
 
   /* sign the certificate to be signed */
   gnutls_x509_crt_privkey_sign(to_be_signed, ca_cert, abs_key, 
@@ -390,7 +390,7 @@ are shown below.
 
 @showfuncdesc{gnutls_pkcs11_obj_get_info}
 
-@showfuncC{gnutls_x509_crt_import_pkcs11,gnutls_x509_crt_import_pkcs11_url,gnutls_x509_crt_list_import_pkcs11}
+@showfuncC{gnutls_x509_crt_import_pkcs11,gnutls_x509_crt_import_url,gnutls_x509_crt_list_import_pkcs11}
 
 Properties of the physical token can also be accessed and altered with @acronym{GnuTLS}.
 For example data in a token can be erased (initialized), PIN can be altered, etc.
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 4bb5bf2753..89dcb98764 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -3665,7 +3665,7 @@ gnutls_x509_crt_get_authority_info_access(gnutls_x509_crt_t crt,
  * the global function set using gnutls_pkcs11_set_pin_function().
  *
  * Note that this callback is currently used only during the import
- * of a PKCS #11 certificate with gnutls_x509_crt_import_pkcs11_url().
+ * of a PKCS #11 certificate with gnutls_x509_crt_import_url().
  *
  * Since: 3.1.0
  *
@@ -3689,7 +3689,9 @@ void gnutls_x509_crt_set_pin_function(gnutls_x509_crt_t crt,
  * fail if the certificate stored is not of X.509 type.
  *
  * Despite its name this function will attempt to import any kind of 
- * URL to certificate. It is synonymous to gnutls_x509_crt_import_pkcs11_url().
+ * URL to certificate. 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
  *   negative error value.