1
0
mirror of https://github.com/moparisthebest/curl synced 2024-11-15 14:05:03 -05:00

hostcheck: only build for the actual users

and make local function static
This commit is contained in:
Daniel Stenberg 2012-11-08 22:37:53 +01:00
parent 1394cad30f
commit 0af1a9d270
2 changed files with 7 additions and 3 deletions

View File

@ -22,6 +22,9 @@
#include "setup.h" #include "setup.h"
#if defined(USE_SSLEAY) || defined(USE_AXTLS)
/* these two backends use functions from this file */
#include "hostcheck.h" #include "hostcheck.h"
#include "rawstr.h" #include "rawstr.h"
@ -34,7 +37,7 @@
* http://tools.ietf.org/html/rfc6125#section-6.4.3 * 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; const char *pattern_label_end, *pattern_wildcard, *hostname_label_end;
int wildcard_enabled; 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 */ if(Curl_raw_equal(hostname, match_pattern)) /* trivial case */
return 1; return 1;
if(Curl_hostmatch(hostname,match_pattern) == CURL_HOST_MATCH) if(hostmatch(hostname,match_pattern) == CURL_HOST_MATCH)
return 1; return 1;
return 0; return 0;
} }
#endif /* SSLEAY or AXTLS */

View File

@ -26,7 +26,6 @@
#define CURL_HOST_NOMATCH 0 #define CURL_HOST_NOMATCH 0
#define CURL_HOST_MATCH 1 #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); int Curl_cert_hostcheck(const char *match_pattern, const char *hostname);
#endif #endif