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

1 files changed, 63 insertions, 63 deletions

diff --git a/contrib/libs/curl/lib/vauth/spnego_sspi.c b/contrib/libs/curl/lib/vauth/spnego_sspi.c
index 4df80d804f..e7482a43e2 100644
--- a/contrib/libs/curl/lib/vauth/spnego_sspi.c
+++ b/contrib/libs/curl/lib/vauth/spnego_sspi.c
@@ -59,12 +59,12 @@ bool Curl_auth_is_spnego_supported(void)
                                               TEXT(SP_NAME_NEGOTIATE),
                                               &SecurityPackage);
 
-  /* Release the package buffer as it is not required anymore */ 
-  if(status == SEC_E_OK) { 
-    s_pSecFn->FreeContextBuffer(SecurityPackage); 
-  } 
- 
- 
+  /* Release the package buffer as it is not required anymore */
+  if(status == SEC_E_OK) {
+    s_pSecFn->FreeContextBuffer(SecurityPackage);
+  }
+
+
   return (status == SEC_E_OK ? TRUE : FALSE);
 }
 
@@ -98,7 +98,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
   size_t chlglen = 0;
   unsigned char *chlg = NULL;
   PSecPkgInfo SecurityPackage;
-  SecBuffer chlg_buf[2]; 
+  SecBuffer chlg_buf[2];
   SecBuffer resp_buf;
   SecBufferDesc chlg_desc;
   SecBufferDesc resp_desc;
@@ -113,7 +113,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
     /* We finished successfully our part of authentication, but server
      * rejected it (since we're again here). Exit with an error since we
      * can't invent anything better */
-    Curl_auth_cleanup_spnego(nego); 
+    Curl_auth_cleanup_spnego(nego);
     return CURLE_LOGIN_DENIED;
   }
 
@@ -173,7 +173,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
                                          nego->p_identity, NULL, NULL,
                                          nego->credentials, &expiry);
     if(nego->status != SEC_E_OK)
-      return CURLE_AUTH_ERROR; 
+      return CURLE_AUTH_ERROR;
 
     /* Allocate our new context handle */
     nego->context = calloc(1, sizeof(CtxtHandle));
@@ -197,39 +197,39 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
     }
 
     /* Setup the challenge "input" security buffer */
-    chlg_desc.ulVersion    = SECBUFFER_VERSION; 
-    chlg_desc.cBuffers     = 1; 
-    chlg_desc.pBuffers     = &chlg_buf[0]; 
-    chlg_buf[0].BufferType = SECBUFFER_TOKEN; 
-    chlg_buf[0].pvBuffer   = chlg; 
-    chlg_buf[0].cbBuffer   = curlx_uztoul(chlglen); 
- 
-#ifdef SECPKG_ATTR_ENDPOINT_BINDINGS 
-    /* ssl context comes from Schannel. 
-    * When extended protection is used in IIS server, 
-    * we have to pass a second SecBuffer to the SecBufferDesc 
-    * otherwise IIS will not pass the authentication (401 response). 
-    * Minimum supported version is Windows 7. 
-    * https://docs.microsoft.com/en-us/security-updates 
-    * /SecurityAdvisories/2009/973811 
-    */ 
-    if(nego->sslContext) { 
-      SEC_CHANNEL_BINDINGS channelBindings; 
-      SecPkgContext_Bindings pkgBindings; 
-      pkgBindings.Bindings = &channelBindings; 
-      nego->status = s_pSecFn->QueryContextAttributes( 
-          nego->sslContext, 
-          SECPKG_ATTR_ENDPOINT_BINDINGS, 
-          &pkgBindings 
-      ); 
-      if(nego->status == SEC_E_OK) { 
-        chlg_desc.cBuffers++; 
-        chlg_buf[1].BufferType = SECBUFFER_CHANNEL_BINDINGS; 
-        chlg_buf[1].cbBuffer   = pkgBindings.BindingsLength; 
-        chlg_buf[1].pvBuffer   = pkgBindings.Bindings; 
-      } 
-    } 
-#endif 
+    chlg_desc.ulVersion    = SECBUFFER_VERSION;
+    chlg_desc.cBuffers     = 1;
+    chlg_desc.pBuffers     = &chlg_buf[0];
+    chlg_buf[0].BufferType = SECBUFFER_TOKEN;
+    chlg_buf[0].pvBuffer   = chlg;
+    chlg_buf[0].cbBuffer   = curlx_uztoul(chlglen);
+
+#ifdef SECPKG_ATTR_ENDPOINT_BINDINGS
+    /* ssl context comes from Schannel.
+    * When extended protection is used in IIS server,
+    * we have to pass a second SecBuffer to the SecBufferDesc
+    * otherwise IIS will not pass the authentication (401 response).
+    * Minimum supported version is Windows 7.
+    * https://docs.microsoft.com/en-us/security-updates
+    * /SecurityAdvisories/2009/973811
+    */
+    if(nego->sslContext) {
+      SEC_CHANNEL_BINDINGS channelBindings;
+      SecPkgContext_Bindings pkgBindings;
+      pkgBindings.Bindings = &channelBindings;
+      nego->status = s_pSecFn->QueryContextAttributes(
+          nego->sslContext,
+          SECPKG_ATTR_ENDPOINT_BINDINGS,
+          &pkgBindings
+      );
+      if(nego->status == SEC_E_OK) {
+        chlg_desc.cBuffers++;
+        chlg_buf[1].BufferType = SECBUFFER_CHANNEL_BINDINGS;
+        chlg_buf[1].cbBuffer   = pkgBindings.BindingsLength;
+        chlg_buf[1].pvBuffer   = pkgBindings.Bindings;
+      }
+    }
+#endif
   }
 
   /* Setup the response "output" security buffer */
@@ -256,28 +256,28 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
   free(chlg);
 
   if(GSS_ERROR(nego->status)) {
-    char buffer[STRERROR_LEN]; 
+    char buffer[STRERROR_LEN];
     failf(data, "InitializeSecurityContext failed: %s",
-          Curl_sspi_strerror(nego->status, buffer, sizeof(buffer))); 
- 
-    if(nego->status == (DWORD)SEC_E_INSUFFICIENT_MEMORY) 
-      return CURLE_OUT_OF_MEMORY; 
- 
-    return CURLE_AUTH_ERROR; 
+          Curl_sspi_strerror(nego->status, buffer, sizeof(buffer)));
+
+    if(nego->status == (DWORD)SEC_E_INSUFFICIENT_MEMORY)
+      return CURLE_OUT_OF_MEMORY;
+
+    return CURLE_AUTH_ERROR;
   }
 
   if(nego->status == SEC_I_COMPLETE_NEEDED ||
      nego->status == SEC_I_COMPLETE_AND_CONTINUE) {
     nego->status = s_pSecFn->CompleteAuthToken(nego->context, &resp_desc);
     if(GSS_ERROR(nego->status)) {
-      char buffer[STRERROR_LEN]; 
-      failf(data, "CompleteAuthToken failed: %s", 
-            Curl_sspi_strerror(nego->status, buffer, sizeof(buffer))); 
- 
-      if(nego->status == (DWORD)SEC_E_INSUFFICIENT_MEMORY) 
-        return CURLE_OUT_OF_MEMORY; 
- 
-      return CURLE_AUTH_ERROR; 
+      char buffer[STRERROR_LEN];
+      failf(data, "CompleteAuthToken failed: %s",
+            Curl_sspi_strerror(nego->status, buffer, sizeof(buffer)));
+
+      if(nego->status == (DWORD)SEC_E_INSUFFICIENT_MEMORY)
+        return CURLE_OUT_OF_MEMORY;
+
+      return CURLE_AUTH_ERROR;
     }
   }
 
@@ -326,7 +326,7 @@ CURLcode Curl_auth_create_spnego_message(struct Curl_easy *data,
 }
 
 /*
- * Curl_auth_cleanup_spnego() 
+ * Curl_auth_cleanup_spnego()
  *
  * This is used to clean up the SPNEGO (Negotiate) specific data.
  *
@@ -335,7 +335,7 @@ CURLcode Curl_auth_create_spnego_message(struct Curl_easy *data,
  * nego     [in/out] - The Negotiate data struct being cleaned up.
  *
  */
-void Curl_auth_cleanup_spnego(struct negotiatedata *nego) 
+void Curl_auth_cleanup_spnego(struct negotiatedata *nego)
 {
   /* Free our security context */
   if(nego->context) {
@@ -362,10 +362,10 @@ void Curl_auth_cleanup_spnego(struct negotiatedata *nego)
   /* Reset any variables */
   nego->status = 0;
   nego->token_max = 0;
-  nego->noauthpersist = FALSE; 
-  nego->havenoauthpersist = FALSE; 
-  nego->havenegdata = FALSE; 
-  nego->havemultiplerequests = FALSE; 
+  nego->noauthpersist = FALSE;
+  nego->havenoauthpersist = FALSE;
+  nego->havenegdata = FALSE;
+  nego->havemultiplerequests = FALSE;
 }
 
 #endif /* USE_WINDOWS_SSPI && USE_SPNEGO */