gnutls_x509_crt_import_pkcs11_url moved to pkcs11.h as it was always defined there

diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 3a2edcd5590f321ed240d81e3061f3bcc7fa4e64..0ba72a53d8ea44cba5a056cf6a4594031d2c3015 100644 (file)
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -419,6 +419,7 @@ gnutls_pkcs11_copy_attached_extension(const char *token_url,
                                      const char *label,
                                      unsigned int flags);
 
+#define gnutls_x509_crt_import_pkcs11_url gnutls_x509_crt_import_url
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus

diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 5cdf7db20e465c635d9b27f994275b2295ea0090..c549349fe2b2852cad5a811d3d63b9a7d8d5767f 100644 (file)
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -138,7 +138,6 @@ int gnutls_x509_crt_list_import(gnutls_x509_crt_t * certs,
                                gnutls_x509_crt_fmt_t format,
                                unsigned int flags);
 
-#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_* */