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

1 files changed, 247 insertions, 247 deletions

diff --git a/contrib/libs/curl/lib/md4.c b/contrib/libs/curl/lib/md4.c
index c5b2acca89..d3355ad929 100644
--- a/contrib/libs/curl/lib/md4.c
+++ b/contrib/libs/curl/lib/md4.c
@@ -1,233 +1,233 @@
-/*************************************************************************** 
- *                                  _   _ ____  _ 
- *  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" 
- 
-#if !defined(CURL_DISABLE_CRYPTO_AUTH) 
- 
-#include "curl_md4.h" 
-#include "warnless.h" 
- 
-#ifdef USE_OPENSSL 
-#include <openssl/opensslconf.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(CURL_DISABLE_CRYPTO_AUTH)
+
+#include "curl_md4.h"
+#include "warnless.h"
+
+#ifdef USE_OPENSSL
+#include <openssl/opensslconf.h>
 #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
 /* OpenSSL 3.0.0 marks the MD4 functions as deprecated */
 #define OPENSSL_NO_MD4
-#endif 
+#endif
 #endif /* USE_OPENSSL */
 
-#ifdef USE_MBEDTLS 
-#error #include <mbedtls/config.h> 
+#ifdef USE_MBEDTLS
+#error #include <mbedtls/config.h>
 #error #include <mbedtls/version.h>
 
 #if(MBEDTLS_VERSION_NUMBER >= 0x02070000)
   #define HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS
-#endif 
+#endif
 #endif /* USE_MBEDTLS */
- 
-#if defined(USE_GNUTLS_NETTLE) 
- 
-#include <nettle/md4.h> 
- 
-#include "curl_memory.h" 
- 
-/* The last #include file should be: */ 
-#include "memdebug.h" 
- 
-typedef struct md4_ctx MD4_CTX; 
- 
-static void MD4_Init(MD4_CTX *ctx) 
-{ 
-  md4_init(ctx); 
-} 
- 
-static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size) 
-{ 
-  md4_update(ctx, size, data); 
-} 
- 
-static void MD4_Final(unsigned char *result, MD4_CTX *ctx) 
-{ 
-  md4_digest(ctx, MD4_DIGEST_SIZE, result); 
-} 
- 
-#elif defined(USE_GNUTLS) 
- 
-#include <gcrypt.h> 
- 
-#include "curl_memory.h" 
-
-/* The last #include file should be: */ 
-#include "memdebug.h" 
- 
+
+#if defined(USE_GNUTLS_NETTLE)
+
+#include <nettle/md4.h>
+
+#include "curl_memory.h"
+
+/* The last #include file should be: */
+#include "memdebug.h"
+
+typedef struct md4_ctx MD4_CTX;
+
+static void MD4_Init(MD4_CTX *ctx)
+{
+  md4_init(ctx);
+}
+
+static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
+{
+  md4_update(ctx, size, data);
+}
+
+static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
+{
+  md4_digest(ctx, MD4_DIGEST_SIZE, result);
+}
+
+#elif defined(USE_GNUTLS)
+
+#include <gcrypt.h>
+
+#include "curl_memory.h"
+
+/* The last #include file should be: */
+#include "memdebug.h"
+
 typedef gcry_md_hd_t MD4_CTX;
- 
-static void MD4_Init(MD4_CTX *ctx) 
-{ 
-  gcry_md_open(ctx, GCRY_MD_MD4, 0); 
-} 
- 
-static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size) 
-{ 
-  gcry_md_write(*ctx, data, size); 
-} 
- 
-static void MD4_Final(unsigned char *result, MD4_CTX *ctx) 
-{ 
+
+static void MD4_Init(MD4_CTX *ctx)
+{
+  gcry_md_open(ctx, GCRY_MD_MD4, 0);
+}
+
+static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
+{
+  gcry_md_write(*ctx, data, size);
+}
+
+static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
+{
   memcpy(result, gcry_md_read(*ctx, 0), MD4_DIGEST_LENGTH);
   gcry_md_close(*ctx);
-} 
- 
-#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4) 
-/* When OpenSSL is available we use the MD4-functions from OpenSSL */ 
-#include <openssl/md4.h> 
- 
+}
+
+#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4)
+/* When OpenSSL is available we use the MD4-functions from OpenSSL */
+#include <openssl/md4.h>
+
 #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \
               (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040) && \
        defined(__MAC_OS_X_VERSION_MIN_ALLOWED) && \
               (__MAC_OS_X_VERSION_MIN_ALLOWED < 101500)) || \
       (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \
               (__IPHONE_OS_VERSION_MAX_ALLOWED >= 20000))
- 
-#include <CommonCrypto/CommonDigest.h> 
- 
-#include "curl_memory.h" 
-
-/* The last #include file should be: */ 
-#include "memdebug.h" 
- 
+
+#include <CommonCrypto/CommonDigest.h>
+
+#include "curl_memory.h"
+
+/* The last #include file should be: */
+#include "memdebug.h"
+
 typedef CC_MD4_CTX MD4_CTX;
- 
-static void MD4_Init(MD4_CTX *ctx) 
-{ 
+
+static void MD4_Init(MD4_CTX *ctx)
+{
   (void)CC_MD4_Init(ctx);
-} 
- 
-static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size) 
-{ 
+}
+
+static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
+{
   (void)CC_MD4_Update(ctx, data, (CC_LONG)size);
-} 
- 
-static void MD4_Final(unsigned char *result, MD4_CTX *ctx) 
-{ 
+}
+
+static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
+{
   (void)CC_MD4_Final(result, ctx);
-} 
- 
-#elif defined(USE_WIN32_CRYPTO) 
- 
-#include <wincrypt.h> 
- 
-#include "curl_memory.h" 
+}
+
+#elif defined(USE_WIN32_CRYPTO)
+
+#include <wincrypt.h>
+
+#include "curl_memory.h"
 
 /* The last #include file should be: */
-#include "memdebug.h" 
- 
+#include "memdebug.h"
+
 struct md4_ctx {
-  HCRYPTPROV hCryptProv; 
-  HCRYPTHASH hHash; 
+  HCRYPTPROV hCryptProv;
+  HCRYPTHASH hHash;
 };
 typedef struct md4_ctx MD4_CTX;
- 
-static void MD4_Init(MD4_CTX *ctx) 
-{ 
-  ctx->hCryptProv = 0; 
-  ctx->hHash = 0; 
- 
-  if(CryptAcquireContext(&ctx->hCryptProv, NULL, NULL, PROV_RSA_FULL, 
+
+static void MD4_Init(MD4_CTX *ctx)
+{
+  ctx->hCryptProv = 0;
+  ctx->hHash = 0;
+
+  if(CryptAcquireContext(&ctx->hCryptProv, NULL, NULL, PROV_RSA_FULL,
                          CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
-    CryptCreateHash(ctx->hCryptProv, CALG_MD4, 0, 0, &ctx->hHash); 
-  } 
-} 
- 
-static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size) 
-{ 
+    CryptCreateHash(ctx->hCryptProv, CALG_MD4, 0, 0, &ctx->hHash);
+  }
+}
+
+static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
+{
   CryptHashData(ctx->hHash, (BYTE *)data, (unsigned int) size, 0);
-} 
- 
-static void MD4_Final(unsigned char *result, MD4_CTX *ctx) 
-{ 
-  unsigned long length = 0; 
- 
-  CryptGetHashParam(ctx->hHash, HP_HASHVAL, NULL, &length, 0); 
-  if(length == MD4_DIGEST_LENGTH) 
-    CryptGetHashParam(ctx->hHash, HP_HASHVAL, result, &length, 0); 
- 
-  if(ctx->hHash) 
-    CryptDestroyHash(ctx->hHash); 
- 
-  if(ctx->hCryptProv) 
-    CryptReleaseContext(ctx->hCryptProv, 0); 
-} 
- 
-#elif(defined(USE_MBEDTLS) && defined(MBEDTLS_MD4_C)) 
- 
-#error #include <mbedtls/md4.h> 
- 
-#include "curl_memory.h" 
-
-/* The last #include file should be: */ 
-#include "memdebug.h" 
- 
+}
+
+static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
+{
+  unsigned long length = 0;
+
+  CryptGetHashParam(ctx->hHash, HP_HASHVAL, NULL, &length, 0);
+  if(length == MD4_DIGEST_LENGTH)
+    CryptGetHashParam(ctx->hHash, HP_HASHVAL, result, &length, 0);
+
+  if(ctx->hHash)
+    CryptDestroyHash(ctx->hHash);
+
+  if(ctx->hCryptProv)
+    CryptReleaseContext(ctx->hCryptProv, 0);
+}
+
+#elif(defined(USE_MBEDTLS) && defined(MBEDTLS_MD4_C))
+
+#error #include <mbedtls/md4.h>
+
+#include "curl_memory.h"
+
+/* The last #include file should be: */
+#include "memdebug.h"
+
 struct md4_ctx {
-  void *data; 
-  unsigned long size; 
+  void *data;
+  unsigned long size;
 };
 typedef struct md4_ctx MD4_CTX;
- 
-static void MD4_Init(MD4_CTX *ctx) 
-{ 
-  ctx->data = NULL; 
-  ctx->size = 0; 
-} 
- 
-static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size) 
-{ 
-  if(ctx->data == NULL) { 
-    ctx->data = malloc(size); 
-    if(ctx->data != NULL) { 
-      memcpy(ctx->data, data, size); 
-      ctx->size = size; 
-    } 
-  } 
-} 
- 
-static void MD4_Final(unsigned char *result, MD4_CTX *ctx) 
-{ 
-  if(ctx->data != NULL) { 
+
+static void MD4_Init(MD4_CTX *ctx)
+{
+  ctx->data = NULL;
+  ctx->size = 0;
+}
+
+static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
+{
+  if(ctx->data == NULL) {
+    ctx->data = malloc(size);
+    if(ctx->data != NULL) {
+      memcpy(ctx->data, data, size);
+      ctx->size = size;
+    }
+  }
+}
+
+static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
+{
+  if(ctx->data != NULL) {
 #if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS)
-    mbedtls_md4(ctx->data, ctx->size, result); 
+    mbedtls_md4(ctx->data, ctx->size, result);
 #else
     (void) mbedtls_md4_ret(ctx->data, ctx->size, result);
 #endif
- 
-    Curl_safefree(ctx->data); 
-    ctx->size = 0; 
-  } 
-} 
- 
-#else 
-/* When no other crypto library is available, or the crypto library doesn't 
- * support MD4, we use this code segment this implementation of it 
- * 
+
+    Curl_safefree(ctx->data);
+    ctx->size = 0;
+  }
+}
+
+#else
+/* When no other crypto library is available, or the crypto library doesn't
+ * support MD4, we use this code segment this implementation of it
+ *
  * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
  * MD4 Message-Digest Algorithm (RFC 1320).
  *
@@ -340,8 +340,8 @@ static const void *body(MD4_CTX *ctx, const void *data, unsigned long size)
   d = ctx->d;
 
   do {
-    MD4_u32plus saved_a, saved_b, saved_c, saved_d; 
- 
+    MD4_u32plus saved_a, saved_b, saved_c, saved_d;
+
     saved_a = a;
     saved_b = b;
     saved_c = c;
@@ -349,59 +349,59 @@ static const void *body(MD4_CTX *ctx, const void *data, unsigned long size)
 
 /* Round 1 */
     STEP(F, a, b, c, d, SET(0), 3)
-    STEP(F, d, a, b, c, SET(1), 7) 
-    STEP(F, c, d, a, b, SET(2), 11) 
-    STEP(F, b, c, d, a, SET(3), 19) 
-    STEP(F, a, b, c, d, SET(4), 3) 
-    STEP(F, d, a, b, c, SET(5), 7) 
-    STEP(F, c, d, a, b, SET(6), 11) 
-    STEP(F, b, c, d, a, SET(7), 19) 
-    STEP(F, a, b, c, d, SET(8), 3) 
-    STEP(F, d, a, b, c, SET(9), 7) 
-    STEP(F, c, d, a, b, SET(10), 11) 
-    STEP(F, b, c, d, a, SET(11), 19) 
-    STEP(F, a, b, c, d, SET(12), 3) 
-    STEP(F, d, a, b, c, SET(13), 7) 
-    STEP(F, c, d, a, b, SET(14), 11) 
-    STEP(F, b, c, d, a, SET(15), 19) 
+    STEP(F, d, a, b, c, SET(1), 7)
+    STEP(F, c, d, a, b, SET(2), 11)
+    STEP(F, b, c, d, a, SET(3), 19)
+    STEP(F, a, b, c, d, SET(4), 3)
+    STEP(F, d, a, b, c, SET(5), 7)
+    STEP(F, c, d, a, b, SET(6), 11)
+    STEP(F, b, c, d, a, SET(7), 19)
+    STEP(F, a, b, c, d, SET(8), 3)
+    STEP(F, d, a, b, c, SET(9), 7)
+    STEP(F, c, d, a, b, SET(10), 11)
+    STEP(F, b, c, d, a, SET(11), 19)
+    STEP(F, a, b, c, d, SET(12), 3)
+    STEP(F, d, a, b, c, SET(13), 7)
+    STEP(F, c, d, a, b, SET(14), 11)
+    STEP(F, b, c, d, a, SET(15), 19)
 
 /* Round 2 */
-    STEP(G, a, b, c, d, GET(0) + 0x5a827999, 3) 
-    STEP(G, d, a, b, c, GET(4) + 0x5a827999, 5) 
-    STEP(G, c, d, a, b, GET(8) + 0x5a827999, 9) 
-    STEP(G, b, c, d, a, GET(12) + 0x5a827999, 13) 
-    STEP(G, a, b, c, d, GET(1) + 0x5a827999, 3) 
-    STEP(G, d, a, b, c, GET(5) + 0x5a827999, 5) 
-    STEP(G, c, d, a, b, GET(9) + 0x5a827999, 9) 
-    STEP(G, b, c, d, a, GET(13) + 0x5a827999, 13) 
-    STEP(G, a, b, c, d, GET(2) + 0x5a827999, 3) 
-    STEP(G, d, a, b, c, GET(6) + 0x5a827999, 5) 
-    STEP(G, c, d, a, b, GET(10) + 0x5a827999, 9) 
-    STEP(G, b, c, d, a, GET(14) + 0x5a827999, 13) 
-    STEP(G, a, b, c, d, GET(3) + 0x5a827999, 3) 
-    STEP(G, d, a, b, c, GET(7) + 0x5a827999, 5) 
-    STEP(G, c, d, a, b, GET(11) + 0x5a827999, 9) 
-    STEP(G, b, c, d, a, GET(15) + 0x5a827999, 13) 
+    STEP(G, a, b, c, d, GET(0) + 0x5a827999, 3)
+    STEP(G, d, a, b, c, GET(4) + 0x5a827999, 5)
+    STEP(G, c, d, a, b, GET(8) + 0x5a827999, 9)
+    STEP(G, b, c, d, a, GET(12) + 0x5a827999, 13)
+    STEP(G, a, b, c, d, GET(1) + 0x5a827999, 3)
+    STEP(G, d, a, b, c, GET(5) + 0x5a827999, 5)
+    STEP(G, c, d, a, b, GET(9) + 0x5a827999, 9)
+    STEP(G, b, c, d, a, GET(13) + 0x5a827999, 13)
+    STEP(G, a, b, c, d, GET(2) + 0x5a827999, 3)
+    STEP(G, d, a, b, c, GET(6) + 0x5a827999, 5)
+    STEP(G, c, d, a, b, GET(10) + 0x5a827999, 9)
+    STEP(G, b, c, d, a, GET(14) + 0x5a827999, 13)
+    STEP(G, a, b, c, d, GET(3) + 0x5a827999, 3)
+    STEP(G, d, a, b, c, GET(7) + 0x5a827999, 5)
+    STEP(G, c, d, a, b, GET(11) + 0x5a827999, 9)
+    STEP(G, b, c, d, a, GET(15) + 0x5a827999, 13)
 
 /* Round 3 */
-    STEP(H, a, b, c, d, GET(0) + 0x6ed9eba1, 3) 
-    STEP(H, d, a, b, c, GET(8) + 0x6ed9eba1, 9) 
-    STEP(H, c, d, a, b, GET(4) + 0x6ed9eba1, 11) 
-    STEP(H, b, c, d, a, GET(12) + 0x6ed9eba1, 15) 
-    STEP(H, a, b, c, d, GET(2) + 0x6ed9eba1, 3) 
-    STEP(H, d, a, b, c, GET(10) + 0x6ed9eba1, 9) 
-    STEP(H, c, d, a, b, GET(6) + 0x6ed9eba1, 11) 
-    STEP(H, b, c, d, a, GET(14) + 0x6ed9eba1, 15) 
-    STEP(H, a, b, c, d, GET(1) + 0x6ed9eba1, 3) 
-    STEP(H, d, a, b, c, GET(9) + 0x6ed9eba1, 9) 
-    STEP(H, c, d, a, b, GET(5) + 0x6ed9eba1, 11) 
-    STEP(H, b, c, d, a, GET(13) + 0x6ed9eba1, 15) 
-    STEP(H, a, b, c, d, GET(3) + 0x6ed9eba1, 3) 
-    STEP(H, d, a, b, c, GET(11) + 0x6ed9eba1, 9) 
-    STEP(H, c, d, a, b, GET(7) + 0x6ed9eba1, 11) 
-    STEP(H, b, c, d, a, GET(15) + 0x6ed9eba1, 15) 
-
-    a += saved_a; 
+    STEP(H, a, b, c, d, GET(0) + 0x6ed9eba1, 3)
+    STEP(H, d, a, b, c, GET(8) + 0x6ed9eba1, 9)
+    STEP(H, c, d, a, b, GET(4) + 0x6ed9eba1, 11)
+    STEP(H, b, c, d, a, GET(12) + 0x6ed9eba1, 15)
+    STEP(H, a, b, c, d, GET(2) + 0x6ed9eba1, 3)
+    STEP(H, d, a, b, c, GET(10) + 0x6ed9eba1, 9)
+    STEP(H, c, d, a, b, GET(6) + 0x6ed9eba1, 11)
+    STEP(H, b, c, d, a, GET(14) + 0x6ed9eba1, 15)
+    STEP(H, a, b, c, d, GET(1) + 0x6ed9eba1, 3)
+    STEP(H, d, a, b, c, GET(9) + 0x6ed9eba1, 9)
+    STEP(H, c, d, a, b, GET(5) + 0x6ed9eba1, 11)
+    STEP(H, b, c, d, a, GET(13) + 0x6ed9eba1, 15)
+    STEP(H, a, b, c, d, GET(3) + 0x6ed9eba1, 3)
+    STEP(H, d, a, b, c, GET(11) + 0x6ed9eba1, 9)
+    STEP(H, c, d, a, b, GET(7) + 0x6ed9eba1, 11)
+    STEP(H, b, c, d, a, GET(15) + 0x6ed9eba1, 15)
+
+    a += saved_a;
     b += saved_b;
     c += saved_c;
     d += saved_d;
@@ -431,7 +431,7 @@ static void MD4_Init(MD4_CTX *ctx)
 static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
 {
   MD4_u32plus saved_lo;
-  unsigned long used; 
+  unsigned long used;
 
   saved_lo = ctx->lo;
   ctx->lo = (saved_lo + size) & 0x1fffffff;
@@ -442,7 +442,7 @@ static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
   used = saved_lo & 0x3f;
 
   if(used) {
-    unsigned long available = 64 - used; 
+    unsigned long available = 64 - used;
 
     if(size < available) {
       memcpy(&ctx->buffer[used], data, size);
@@ -514,7 +514,7 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
   memset(ctx, 0, sizeof(*ctx));
 }
 
-#endif /* CRYPTO LIBS */ 
+#endif /* CRYPTO LIBS */
 
 void Curl_md4it(unsigned char *output, const unsigned char *input,
                 const size_t len)
@@ -525,5 +525,5 @@ void Curl_md4it(unsigned char *output, const unsigned char *input,
   MD4_Update(&ctx, input, curlx_uztoui(len));
   MD4_Final(output, &ctx);
 }
- 
-#endif /* CURL_DISABLE_CRYPTO_AUTH */ 
+
+#endif /* CURL_DISABLE_CRYPTO_AUTH */