gnutls_x509_crt_import_url replaces gnutls_x509_crt_import_pkcs11_url

diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 87b948d588bac3ddef68613de0e042113c57a955..5cdf7db20e465c635d9b27f994275b2295ea0090 100644 (file)
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -138,11 +138,11 @@ int gnutls_x509_crt_list_import(gnutls_x509_crt_t * certs,
                                gnutls_x509_crt_fmt_t format,
                                unsigned int flags);
 
-int gnutls_x509_crt_import_pkcs11_url(gnutls_x509_crt_t crt,
+#define gnutls_x509_crt_import_pkcs11_url gnutls_x509_crt_import_url
+int gnutls_x509_crt_import_url(gnutls_x509_crt_t crt,
                                      const char *url, unsigned int flags
                                      /* GNUTLS_PKCS11_OBJ_FLAG_* */
     );
-#define gnutls_x509_crt_import_url gnutls_x509_crt_import_pkcs11_url
 
 int gnutls_x509_crt_export(gnutls_x509_crt_t cert,
                           gnutls_x509_crt_fmt_t format,

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 33f2c78201a12bd9318726ed86b7ea2c133da22d..92a6030def575d0684bc24eb53a3e5aba0001866 100644 (file)
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -541,7 +541,7 @@ GNUTLS_3_4
        gnutls_x509_crt_import_pkcs11;
        gnutls_pkcs11_obj_get_type;
        gnutls_x509_crt_list_import_pkcs11;
-       gnutls_x509_crt_import_pkcs11_url;
+       gnutls_x509_crt_import_url;
        gnutls_pkcs11_obj_get_info;
        gnutls_pkcs11_token_get_info;
        gnutls_pkcs11_token_get_url;

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 513de83a7382da1fad47cfcdf02ccdcc1ba79b6d..caca5e52d29880198c69d6c5ade6de44ebceb12a 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -3679,7 +3679,7 @@ void gnutls_x509_crt_set_pin_function(gnutls_x509_crt_t crt,
 }
 
 /**
- * gnutls_x509_crt_import_pkcs11_url:
+ * 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
@@ -3689,15 +3689,15 @@ 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_url().
+ * URL to certificate. It is synonymous to gnutls_x509_crt_import_pkcs11_url().
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  *   negative error value.
  *
- * Since: 2.12.0
+ * Since: 3.4.0
  **/
 int
-gnutls_x509_crt_import_pkcs11_url(gnutls_x509_crt_t crt,
+gnutls_x509_crt_import_url(gnutls_x509_crt_t crt,
                                  const char *url, unsigned int flags)
 {
        char *xurl;