mirror of
https://github.com/moparisthebest/curl
synced 2024-11-13 21:15:08 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.
Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]
Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]
----------------------------------------
1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
this single inclusion guard is enough to ensure that inclusion of
lib/setup_once.h done from lib/setup.h is only done once.
Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
protect inclusion of setup_once.h even after commit ec691ca3, this
was to avoid a circular header inclusion triggered when building a
c-ares enabled version with c-ares sources available which also has
a setup_once.h header. Commit ec691ca3 exposes the real nature of
__SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
foreign to libcurl belonging to c-ares's setup_once.h
The renaming this commit does, fixes the circular header inclusion,
and as such removes the need and usage of a header inclusion guard
foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.
2 - Due to the circular interdependency of old lib/setup_once.h and the
c-ares setup_once.h header, old file lib/setup_once.h has carried
back from 2006 up to now days an alarming and prominent notice about
the need of keeping libcurl's and c-ares's setup_once.h in sync.
Given that this commit fixes the circular interdependency, the need
and presence of mentioned notice is removed.
All mentioned interdependencies come back from now old days when
the c-ares project lived inside a curl subdirectory. This commit
removes last traces of such fact.
97 lines
3.3 KiB
C
97 lines
3.3 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(USE_SSLEAY) || defined(USE_AXTLS)
|
|
/* these two backends use functions from this file */
|
|
|
|
#include "hostcheck.h"
|
|
#include "rawstr.h"
|
|
|
|
/*
|
|
* Match a hostname against a wildcard pattern.
|
|
* E.g.
|
|
* "foo.host.com" matches "*.host.com".
|
|
*
|
|
* We use the matching rule described in RFC6125, section 6.4.3.
|
|
* http://tools.ietf.org/html/rfc6125#section-6.4.3
|
|
*/
|
|
|
|
static int hostmatch(const char *hostname, const char *pattern)
|
|
{
|
|
const char *pattern_label_end, *pattern_wildcard, *hostname_label_end;
|
|
int wildcard_enabled;
|
|
size_t prefixlen, suffixlen;
|
|
pattern_wildcard = strchr(pattern, '*');
|
|
if(pattern_wildcard == NULL)
|
|
return Curl_raw_equal(pattern, hostname) ?
|
|
CURL_HOST_MATCH : CURL_HOST_NOMATCH;
|
|
|
|
/* We require at least 2 dots in pattern to avoid too wide wildcard
|
|
match. */
|
|
wildcard_enabled = 1;
|
|
pattern_label_end = strchr(pattern, '.');
|
|
if(pattern_label_end == NULL || strchr(pattern_label_end+1, '.') == NULL ||
|
|
pattern_wildcard > pattern_label_end ||
|
|
Curl_raw_nequal(pattern, "xn--", 4)) {
|
|
wildcard_enabled = 0;
|
|
}
|
|
if(!wildcard_enabled)
|
|
return Curl_raw_equal(pattern, hostname) ?
|
|
CURL_HOST_MATCH : CURL_HOST_NOMATCH;
|
|
|
|
hostname_label_end = strchr(hostname, '.');
|
|
if(hostname_label_end == NULL ||
|
|
!Curl_raw_equal(pattern_label_end, hostname_label_end))
|
|
return CURL_HOST_NOMATCH;
|
|
|
|
/* The wildcard must match at least one character, so the left-most
|
|
label of the hostname is at least as large as the left-most label
|
|
of the pattern. */
|
|
if(hostname_label_end - hostname < pattern_label_end - pattern)
|
|
return CURL_HOST_NOMATCH;
|
|
|
|
prefixlen = pattern_wildcard - pattern;
|
|
suffixlen = pattern_label_end - (pattern_wildcard+1);
|
|
return Curl_raw_nequal(pattern, hostname, prefixlen) &&
|
|
Curl_raw_nequal(pattern_wildcard+1, hostname_label_end - suffixlen,
|
|
suffixlen) ?
|
|
CURL_HOST_MATCH : CURL_HOST_NOMATCH;
|
|
}
|
|
|
|
int Curl_cert_hostcheck(const char *match_pattern, const char *hostname)
|
|
{
|
|
if(!match_pattern || !*match_pattern ||
|
|
!hostname || !*hostname) /* sanity check */
|
|
return 0;
|
|
|
|
if(Curl_raw_equal(hostname, match_pattern)) /* trivial case */
|
|
return 1;
|
|
|
|
if(hostmatch(hostname,match_pattern) == CURL_HOST_MATCH)
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
#endif /* SSLEAY or AXTLS */
|