Restoring authorship annotation for Nikita Slyusarev <nslus@yandex-team.com>. Commit 1 of 2.

1 files changed, 74 insertions, 74 deletions

diff --git a/contrib/libs/curl/lib/hostcheck.c b/contrib/libs/curl/lib/hostcheck.c
index 4d0614aeab..43b1ed7dae 100644
--- a/contrib/libs/curl/lib/hostcheck.c
+++ b/contrib/libs/curl/lib/hostcheck.c
@@ -1,32 +1,32 @@
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
+/*************************************************************************** 
+ *                                  _   _ ____  _ 
+ *  Project                     ___| | | |  _ \| | 
+ *                             / __| | | | |_) | | 
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____| 
+ * 
  * Copyright (C) 1998 - 2020, 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
+ * 
+ * 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 https://curl.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"
-
+ * 
+ * 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_OPENSSL)                                \
   || defined(USE_GSKIT)                                 \
   || defined(USE_SCHANNEL)
-/* these backends use functions from this file */
-
+/* these backends use functions from this file */ 
+ 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -34,20 +34,20 @@
 #error #include <netinet/in6.h>
 #endif
 
-#include "hostcheck.h"
+#include "hostcheck.h" 
 #include "strcase.h"
 #include "inet_pton.h"
-
+ 
 #include "curl_memory.h"
 /* The last #include file should be: */
 #include "memdebug.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.
+/* 
+ * 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. 
  * https://tools.ietf.org/html/rfc6125#section-6.4.3
  *
  * In addition: ignore trailing dots in the host names and wildcards, so that
@@ -60,13 +60,13 @@
  *
  * NOTE: hostmatch() gets called with copied buffers so that it can modify the
  * contents at will.
- */
-
+ */ 
+ 
 static int hostmatch(char *hostname, char *pattern)
-{
-  const char *pattern_label_end, *pattern_wildcard, *hostname_label_end;
-  int wildcard_enabled;
-  size_t prefixlen, suffixlen;
+{ 
+  const char *pattern_label_end, *pattern_wildcard, *hostname_label_end; 
+  int wildcard_enabled; 
+  size_t prefixlen, suffixlen; 
   struct in_addr ignored;
 #ifdef ENABLE_IPV6
   struct sockaddr_in6 si6;
@@ -80,11 +80,11 @@ static int hostmatch(char *hostname, char *pattern)
   if(pattern[len-1]=='.')
     pattern[len-1] = 0;
 
-  pattern_wildcard = strchr(pattern, '*');
-  if(pattern_wildcard == NULL)
+  pattern_wildcard = strchr(pattern, '*'); 
+  if(pattern_wildcard == NULL) 
     return strcasecompare(pattern, hostname) ?
-      CURL_HOST_MATCH : CURL_HOST_NOMATCH;
-
+      CURL_HOST_MATCH : CURL_HOST_NOMATCH; 
+ 
   /* detect IP address as hostname and fail the match if so */
   if(Curl_inet_pton(AF_INET, hostname, &ignored) > 0)
     return CURL_HOST_NOMATCH;
@@ -93,43 +93,43 @@ static int hostmatch(char *hostname, char *pattern)
     return CURL_HOST_NOMATCH;
 #endif
 
-  /* We require at least 2 dots in pattern to avoid too wide wildcard
-     match. */
-  wildcard_enabled = 1;
-  pattern_label_end = strchr(pattern, '.');
+  /* 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 ||
+     pattern_wildcard > pattern_label_end || 
      strncasecompare(pattern, "xn--", 4)) {
-    wildcard_enabled = 0;
-  }
-  if(!wildcard_enabled)
+    wildcard_enabled = 0; 
+  } 
+  if(!wildcard_enabled) 
     return strcasecompare(pattern, hostname) ?
-      CURL_HOST_MATCH : CURL_HOST_NOMATCH;
-
-  hostname_label_end = strchr(hostname, '.');
-  if(hostname_label_end == NULL ||
+      CURL_HOST_MATCH : CURL_HOST_NOMATCH; 
+ 
+  hostname_label_end = strchr(hostname, '.'); 
+  if(hostname_label_end == NULL || 
      !strcasecompare(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;
+    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 strncasecompare(pattern, hostname, prefixlen) &&
     strncasecompare(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)
-{
+                    suffixlen) ? 
+    CURL_HOST_MATCH : CURL_HOST_NOMATCH; 
+} 
+ 
+int Curl_cert_hostcheck(const char *match_pattern, const char *hostname) 
+{ 
   int res = 0;
-  if(!match_pattern || !*match_pattern ||
-      !hostname || !*hostname) /* sanity check */
+  if(!match_pattern || !*match_pattern || 
+      !hostname || !*hostname) /* sanity check */ 
     ;
   else {
     char *matchp = strdup(match_pattern);
@@ -143,8 +143,8 @@ int Curl_cert_hostcheck(const char *match_pattern, const char *hostname)
       free(matchp);
     }
   }
-
+ 
   return res;
-}
-
+} 
+ 
 #endif /* OPENSSL, GSKIT or schannel+wince */