From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 23 Dec 2014 10:04:45 +0000 (+0200)
Subject: gnutls_x509_crt_import_url replaces gnutls_x509_crt_import_pkcs11_url
X-Git-Tag: gnutls_3_4_0~444
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ce1f28d0fd8816323dee4ced4ff93ca87192fe0;p=thirdparty%2Fgnutls.git

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 87b948d588..5cdf7db20e 100644
--- 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 33f2c78201..92a6030def 100644
--- 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 513de83a73..caca5e52d2 100644
--- 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;