Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 1 of 2.

1 files changed, 27 insertions, 27 deletions

diff --git a/contrib/libs/curl/lib/vauth/ntlm.c b/contrib/libs/curl/lib/vauth/ntlm.c
index a3117f3fee..89e2823b15 100644
--- a/contrib/libs/curl/lib/vauth/ntlm.c
+++ b/contrib/libs/curl/lib/vauth/ntlm.c
@@ -183,11 +183,11 @@ static CURLcode ntlm_decode_type2_target(struct Curl_easy *data,
     target_info_len = Curl_read16_le(&buffer[40]);
     target_info_offset = Curl_read32_le(&buffer[44]);
     if(target_info_len > 0) {
-      if((target_info_offset >= size) ||
-         ((target_info_offset + target_info_len) > size) ||
+      if((target_info_offset >= size) || 
+         ((target_info_offset + target_info_len) > size) || 
          (target_info_offset < 48)) {
         infof(data, "NTLM handshake failure (bad type-2 message). "
-              "Target Info Offset Len is set incorrect by the peer\n");
+              "Target Info Offset Len is set incorrect by the peer\n"); 
         return CURLE_BAD_CONTENT_ENCODING;
       }
 
@@ -405,7 +405,7 @@ CURLcode Curl_auth_create_ntlm_type1_message(struct Curl_easy *data,
   (void)hostname,
 
   /* Clean up any former leftovers and initialise to defaults */
-  Curl_auth_cleanup_ntlm(ntlm);
+  Curl_auth_cleanup_ntlm(ntlm); 
 
 #if defined(USE_NTRESPONSES) && defined(USE_NTLM2SESSION)
 #define NTLM2FLAG NTLMFLAG_NEGOTIATE_NTLM2_KEY
@@ -564,7 +564,7 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
   }
 
 #if defined(USE_NTRESPONSES) && defined(USE_NTLM_V2)
-  if(ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM2_KEY) {
+  if(ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM2_KEY) { 
     unsigned char ntbuffer[0x18];
     unsigned char entropy[8];
     unsigned char ntlmv2hash[0x18];
@@ -604,7 +604,7 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
 #define CURL_MD5_DIGEST_LENGTH 16 /* fixed size */
 
   /* We don't support NTLM2 if we don't have USE_NTRESPONSES */
-  if(ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM_KEY) {
+  if(ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM_KEY) { 
     unsigned char ntbuffer[0x18];
     unsigned char tmp[0x18];
     unsigned char md5sum[CURL_MD5_DIGEST_LENGTH];
@@ -636,9 +636,9 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
     Curl_ntlm_core_lm_resp(ntbuffer, md5sum, ntresp);
 
     /* End of NTLM2 Session code */
-    /* NTLM v2 session security is a misnomer because it is not NTLM v2.
-       It is NTLM v1 using the extended session security that is also
-       in NTLM v2 */
+    /* NTLM v2 session security is a misnomer because it is not NTLM v2. 
+       It is NTLM v1 using the extended session security that is also 
+       in NTLM v2 */ 
   }
   else
 #endif
@@ -783,14 +783,14 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
   });
 
 #ifdef USE_NTRESPONSES
-  /* ntresplen + size should not be risking an integer overflow here */
-  if(ntresplen + size > sizeof(ntlmbuf)) {
-    failf(data, "incoming NTLM message too big");
-    return CURLE_OUT_OF_MEMORY;
+  /* ntresplen + size should not be risking an integer overflow here */ 
+  if(ntresplen + size > sizeof(ntlmbuf)) { 
+    failf(data, "incoming NTLM message too big"); 
+    return CURLE_OUT_OF_MEMORY; 
   }
-  DEBUGASSERT(size == (size_t)ntrespoff);
-  memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen);
-  size += ntresplen;
+  DEBUGASSERT(size == (size_t)ntrespoff); 
+  memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen); 
+  size += ntresplen; 
 
   DEBUG_OUT({
     fprintf(stderr, "\n   ntresp=");
@@ -848,22 +848,22 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
   /* Return with binary blob encoded into base64 */
   result = Curl_base64_encode(data, (char *)ntlmbuf, size, outptr, outlen);
 
-  Curl_auth_cleanup_ntlm(ntlm);
+  Curl_auth_cleanup_ntlm(ntlm); 
 
   return result;
 }
 
 /*
- * Curl_auth_cleanup_ntlm()
- *
- * This is used to clean up the NTLM specific data.
- *
- * Parameters:
- *
- * ntlm    [in/out] - The NTLM data struct being cleaned up.
- *
- */
-void Curl_auth_cleanup_ntlm(struct ntlmdata *ntlm)
+ * Curl_auth_cleanup_ntlm() 
+ * 
+ * This is used to clean up the NTLM specific data. 
+ * 
+ * Parameters: 
+ * 
+ * ntlm    [in/out] - The NTLM data struct being cleaned up. 
+ * 
+ */ 
+void Curl_auth_cleanup_ntlm(struct ntlmdata *ntlm) 
 {
   /* Free the target info */
   Curl_safefree(ntlm->target_info);