From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 23 Nov 2014 09:49:32 +0000 (+0100)
Subject: export gnutls_register_custom_url
X-Git-Tag: gnutls_3_4_0~576
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec776377bcbf669cf5596cff302dfbd08618949a;p=thirdparty%2Fgnutls.git

export gnutls_register_custom_url
---

diff --git a/lib/includes/gnutls/urls.h b/lib/includes/gnutls/urls.h
index 5c3063fcf5..fdd3245d84 100644
--- a/lib/includes/gnutls/urls.h
+++ b/lib/includes/gnutls/urls.h
@@ -47,7 +47,7 @@ typedef int (*gnutls_x509_crt_import_url_func)(gnutls_x509_crt_t pkey,
 typedef int (*gnutls_pubkey_import_url_func)(gnutls_pubkey_t pkey,
 					          const char *url, unsigned flags);
 
-typedef struct custom_url_st {
+typedef struct gnutls_custom_url_st {
 	const char *name;
 	unsigned name_size;
 	gnutls_privkey_import_url_func import_key;
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index a3572ddbf2..2b0a32dd9a 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -1064,6 +1064,7 @@ GNUTLS_3_1_0 {
 	gnutls_system_key_iter_get_info;
 	gnutls_system_key_delete;
 	gnutls_system_key_add_x509;
+	gnutls_register_custom_url;
 } GNUTLS_3_0_0;
 
 GNUTLS_FIPS140 {
diff --git a/lib/urls.c b/lib/urls.c
index 269a3236da..f420646c03 100644
--- a/lib/urls.c
+++ b/lib/urls.c
@@ -146,6 +146,7 @@ int _gnutls_url_is_known(const char *url)
 			if (strncmp(url, _gnutls_custom_urls[i].name, _gnutls_custom_urls[i].name_size) == 0)
 				return 1;
 		}
+
 		return 0;
 	}
 }