From 0af1a9d270b982fda4bc62d72d9c1063a6d6f875 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 8 Nov 2012 22:37:53 +0100 Subject: hostcheck: only build for the actual users and make local function static --- lib/hostcheck.c | 9 +++++++-- lib/hostcheck.h | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/hostcheck.c b/lib/hostcheck.c index c8c4ac30c..8affce044 100644 --- a/lib/hostcheck.c +++ b/lib/hostcheck.c @@ -22,6 +22,9 @@ #include "setup.h" +#if defined(USE_SSLEAY) || defined(USE_AXTLS) +/* these two backends use functions from this file */ + #include "hostcheck.h" #include "rawstr.h" @@ -34,7 +37,7 @@ * http://tools.ietf.org/html/rfc6125#section-6.4.3 */ -int Curl_hostmatch(const char *hostname, const char *pattern) +static int hostmatch(const char *hostname, const char *pattern) { const char *pattern_label_end, *pattern_wildcard, *hostname_label_end; int wildcard_enabled; @@ -85,7 +88,9 @@ int Curl_cert_hostcheck(const char *match_pattern, const char *hostname) if(Curl_raw_equal(hostname, match_pattern)) /* trivial case */ return 1; - if(Curl_hostmatch(hostname,match_pattern) == CURL_HOST_MATCH) + if(hostmatch(hostname,match_pattern) == CURL_HOST_MATCH) return 1; return 0; } + +#endif /* SSLEAY or AXTLS */ diff --git a/lib/hostcheck.h b/lib/hostcheck.h index 9019ccbae..51cc4aa82 100644 --- a/lib/hostcheck.h +++ b/lib/hostcheck.h @@ -26,7 +26,6 @@ #define CURL_HOST_NOMATCH 0 #define CURL_HOST_MATCH 1 -int Curl_hostmatch(const char *hostname, const char *pattern); int Curl_cert_hostcheck(const char *match_pattern, const char *hostname); #endif -- cgit v1.2.3