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

4 files changed, 237 insertions, 237 deletions

diff --git a/contrib/libs/openssl/include/crypto/bn_conf-win-i686.h b/contrib/libs/openssl/include/crypto/bn_conf-win-i686.h
index 9c85885cb81..bf6adeb11da 100644
--- a/contrib/libs/openssl/include/crypto/bn_conf-win-i686.h
+++ b/contrib/libs/openssl/include/crypto/bn_conf-win-i686.h
@@ -1,28 +1,28 @@
-/* WARNING: do not edit! */ 
-/* Generated by makefile from include\crypto\bn_conf.h.in */ 
-/* 
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. 
- * 
- * Licensed under the OpenSSL license (the "License").  You may not use 
- * this file except in compliance with the License.  You can obtain a copy 
- * in the file LICENSE in the source distribution or at 
- * https://www.openssl.org/source/license.html 
- */ 
- 
-#ifndef OSSL_CRYPTO_BN_CONF_H 
-# define OSSL_CRYPTO_BN_CONF_H 
- 
-/* 
- * The contents of this file are not used in the UEFI build, as 
- * both 32-bit and 64-bit builds are supported from a single run 
- * of the Configure script. 
- */ 
- 
-/* Should we define BN_DIV2W here? */ 
- 
-/* Only one for the following should be defined */ 
-#undef SIXTY_FOUR_BIT_LONG 
-#undef SIXTY_FOUR_BIT 
-#define THIRTY_TWO_BIT 
- 
-#endif 
+/* WARNING: do not edit! */
+/* Generated by makefile from include\crypto\bn_conf.h.in */
+/*
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
+
+/*
+ * The contents of this file are not used in the UEFI build, as
+ * both 32-bit and 64-bit builds are supported from a single run
+ * of the Configure script.
+ */
+
+/* Should we define BN_DIV2W here? */
+
+/* Only one for the following should be defined */
+#undef SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
+#define THIRTY_TWO_BIT
+
+#endif
diff --git a/contrib/libs/openssl/include/crypto/bn_conf.h b/contrib/libs/openssl/include/crypto/bn_conf.h
index e55a4f0267a..ec5cf5d4d68 100644
--- a/contrib/libs/openssl/include/crypto/bn_conf.h
+++ b/contrib/libs/openssl/include/crypto/bn_conf.h
@@ -15,9 +15,9 @@
 #elif defined(__ANDROID__) && defined(__arm__)
 #   include "bn_conf-android-arm.h"
 #elif defined(_MSC_VER) && defined(_M_X64)
-#   include "bn_conf-win-x86_64.h" 
-#elif defined(_MSC_VER) && defined(_M_IX86) 
-#   include "bn_conf-win-i686.h" 
+#   include "bn_conf-win-x86_64.h"
+#elif defined(_MSC_VER) && defined(_M_IX86)
+#   include "bn_conf-win-i686.h"
 #else
 #   include "bn_conf-osx-linux_aarch64-osx_arm64-linux.h"
 #endif
diff --git a/contrib/libs/openssl/include/openssl/opensslconf-win-i686.h b/contrib/libs/openssl/include/openssl/opensslconf-win-i686.h
index 8d8aed69fdb..49d8cae85a5 100644
--- a/contrib/libs/openssl/include/openssl/opensslconf-win-i686.h
+++ b/contrib/libs/openssl/include/openssl/opensslconf-win-i686.h
@@ -1,203 +1,203 @@
-/* 
- * WARNING: do not edit! 
- * Generated by makefile from include\openssl\opensslconf.h.in 
- * 
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. 
- * 
- * Licensed under the OpenSSL license (the "License").  You may not use 
- * this file except in compliance with the License.  You can obtain a copy 
- * in the file LICENSE in the source distribution or at 
- * https://www.openssl.org/source/license.html 
- */ 
- 
-#include <openssl/opensslv.h> 
- 
-#ifdef  __cplusplus 
-extern "C" { 
-#endif 
- 
-#ifdef OPENSSL_ALGORITHM_DEFINES 
-# error OPENSSL_ALGORITHM_DEFINES no longer supported 
-#endif 
- 
-/* 
- * OpenSSL was configured with the following options: 
- */ 
- 
-#ifndef OPENSSL_SYS_WIN32 
-# define OPENSSL_SYS_WIN32 1 
-#endif 
-#ifndef OPENSSL_NO_MD2 
-# define OPENSSL_NO_MD2 
-#endif 
-#ifndef OPENSSL_NO_RC5 
-# define OPENSSL_NO_RC5 
-#endif 
-#ifndef OPENSSL_RAND_SEED_OS 
-# define OPENSSL_RAND_SEED_OS 
-#endif 
-#ifndef OPENSSL_NO_AFALGENG 
-# define OPENSSL_NO_AFALGENG 
-#endif 
-#ifndef OPENSSL_NO_ASAN 
-# define OPENSSL_NO_ASAN 
-#endif 
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG 
-# define OPENSSL_NO_CRYPTO_MDEBUG 
-#endif 
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE 
-# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE 
-#endif 
-#ifndef OPENSSL_NO_DEVCRYPTOENG 
-# define OPENSSL_NO_DEVCRYPTOENG 
-#endif 
-#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 
-# define OPENSSL_NO_EC_NISTP_64_GCC_128 
-#endif 
-#ifndef OPENSSL_NO_EGD 
-# define OPENSSL_NO_EGD 
-#endif 
-#ifndef OPENSSL_NO_EXTERNAL_TESTS 
-# define OPENSSL_NO_EXTERNAL_TESTS 
-#endif 
-#ifndef OPENSSL_NO_FUZZ_AFL 
-# define OPENSSL_NO_FUZZ_AFL 
-#endif 
-#ifndef OPENSSL_NO_FUZZ_LIBFUZZER 
-# define OPENSSL_NO_FUZZ_LIBFUZZER 
-#endif 
-#ifndef OPENSSL_NO_HEARTBEATS 
-# define OPENSSL_NO_HEARTBEATS 
-#endif 
-#ifndef OPENSSL_NO_MSAN 
-# define OPENSSL_NO_MSAN 
-#endif 
-#ifndef OPENSSL_NO_SCTP 
-# define OPENSSL_NO_SCTP 
-#endif 
-#ifndef OPENSSL_NO_SSL_TRACE 
-# define OPENSSL_NO_SSL_TRACE 
-#endif 
-#ifndef OPENSSL_NO_SSL3 
-# define OPENSSL_NO_SSL3 
-#endif 
-#ifndef OPENSSL_NO_SSL3_METHOD 
-# define OPENSSL_NO_SSL3_METHOD 
-#endif 
-#ifndef OPENSSL_NO_TESTS 
-# define OPENSSL_NO_TESTS 
-#endif 
-#ifndef OPENSSL_NO_UBSAN 
-# define OPENSSL_NO_UBSAN 
-#endif 
-#ifndef OPENSSL_NO_UNIT_TEST 
-# define OPENSSL_NO_UNIT_TEST 
-#endif 
-#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS 
-# define OPENSSL_NO_WEAK_SSL_CIPHERS 
-#endif 
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE 
-# define OPENSSL_NO_DYNAMIC_ENGINE 
-#endif 
- 
- 
-/* 
- * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers 
- * don't like that.  This will hopefully silence them. 
- */ 
-#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy; 
- 
-/* 
- * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the 
- * declarations of functions deprecated in or before <version>. Otherwise, they 
- * still won't see them if the library has been built to disable deprecated 
- * functions. 
- */ 
-#ifndef DECLARE_DEPRECATED 
-# define DECLARE_DEPRECATED(f)   f; 
-# ifdef __GNUC__ 
-#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) 
-#   undef DECLARE_DEPRECATED 
-#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated)); 
-#  endif 
-# elif defined(__SUNPRO_C) 
-#  if (__SUNPRO_C >= 0x5130) 
-#   undef DECLARE_DEPRECATED 
-#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated)); 
-#  endif 
-# endif 
-#endif 
- 
-#ifndef OPENSSL_FILE 
-# ifdef OPENSSL_NO_FILENAMES 
-#  define OPENSSL_FILE "" 
-#  define OPENSSL_LINE 0 
-# else 
-#  define OPENSSL_FILE __FILE__ 
-#  define OPENSSL_LINE __LINE__ 
-# endif 
-#endif 
- 
-#ifndef OPENSSL_MIN_API 
-# define OPENSSL_MIN_API 0 
-#endif 
- 
-#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API 
-# undef OPENSSL_API_COMPAT 
-# define OPENSSL_API_COMPAT OPENSSL_MIN_API 
-#endif 
- 
-/* 
- * Do not deprecate things to be deprecated in version 1.2.0 before the 
- * OpenSSL version number matches. 
- */ 
-#if OPENSSL_VERSION_NUMBER < 0x10200000L 
-# define DEPRECATEDIN_1_2_0(f)   f; 
-#elif OPENSSL_API_COMPAT < 0x10200000L 
-# define DEPRECATEDIN_1_2_0(f)   DECLARE_DEPRECATED(f) 
-#else 
-# define DEPRECATEDIN_1_2_0(f) 
-#endif 
- 
-#if OPENSSL_API_COMPAT < 0x10100000L 
-# define DEPRECATEDIN_1_1_0(f)   DECLARE_DEPRECATED(f) 
-#else 
-# define DEPRECATEDIN_1_1_0(f) 
-#endif 
- 
-#if OPENSSL_API_COMPAT < 0x10000000L 
-# define DEPRECATEDIN_1_0_0(f)   DECLARE_DEPRECATED(f) 
-#else 
-# define DEPRECATEDIN_1_0_0(f) 
-#endif 
- 
-#if OPENSSL_API_COMPAT < 0x00908000L 
-# define DEPRECATEDIN_0_9_8(f)   DECLARE_DEPRECATED(f) 
-#else 
-# define DEPRECATEDIN_0_9_8(f) 
-#endif 
- 
-/* Generate 80386 code? */ 
-#undef I386_ONLY 
- 
-#undef OPENSSL_UNISTD 
-#define OPENSSL_UNISTD <unistd.h> 
- 
-#define OPENSSL_EXPORT_VAR_AS_FUNCTION 
- 
-/* 
- * The following are cipher-specific, but are part of the public API. 
- */ 
-#if !defined(OPENSSL_SYS_UEFI) 
-# define BN_LLONG 
-/* Only one for the following should be defined */ 
-# undef SIXTY_FOUR_BIT_LONG 
-# undef SIXTY_FOUR_BIT 
-# define THIRTY_TWO_BIT 
-#endif 
- 
-#define RC4_INT unsigned int 
- 
-#ifdef  __cplusplus 
-} 
-#endif 
+/*
+ * WARNING: do not edit!
+ * Generated by makefile from include\openssl\opensslconf.h.in
+ *
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <openssl/opensslv.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifdef OPENSSL_ALGORITHM_DEFINES
+# error OPENSSL_ALGORITHM_DEFINES no longer supported
+#endif
+
+/*
+ * OpenSSL was configured with the following options:
+ */
+
+#ifndef OPENSSL_SYS_WIN32
+# define OPENSSL_SYS_WIN32 1
+#endif
+#ifndef OPENSSL_NO_MD2
+# define OPENSSL_NO_MD2
+#endif
+#ifndef OPENSSL_NO_RC5
+# define OPENSSL_NO_RC5
+#endif
+#ifndef OPENSSL_RAND_SEED_OS
+# define OPENSSL_RAND_SEED_OS
+#endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
+#ifndef OPENSSL_NO_ASAN
+# define OPENSSL_NO_ASAN
+#endif
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
+# define OPENSSL_NO_CRYPTO_MDEBUG
+#endif
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+#endif
+#ifndef OPENSSL_NO_DEVCRYPTOENG
+# define OPENSSL_NO_DEVCRYPTOENG
+#endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
+#ifndef OPENSSL_NO_EGD
+# define OPENSSL_NO_EGD
+#endif
+#ifndef OPENSSL_NO_EXTERNAL_TESTS
+# define OPENSSL_NO_EXTERNAL_TESTS
+#endif
+#ifndef OPENSSL_NO_FUZZ_AFL
+# define OPENSSL_NO_FUZZ_AFL
+#endif
+#ifndef OPENSSL_NO_FUZZ_LIBFUZZER
+# define OPENSSL_NO_FUZZ_LIBFUZZER
+#endif
+#ifndef OPENSSL_NO_HEARTBEATS
+# define OPENSSL_NO_HEARTBEATS
+#endif
+#ifndef OPENSSL_NO_MSAN
+# define OPENSSL_NO_MSAN
+#endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_SSL3
+# define OPENSSL_NO_SSL3
+#endif
+#ifndef OPENSSL_NO_SSL3_METHOD
+# define OPENSSL_NO_SSL3_METHOD
+#endif
+#ifndef OPENSSL_NO_TESTS
+# define OPENSSL_NO_TESTS
+#endif
+#ifndef OPENSSL_NO_UBSAN
+# define OPENSSL_NO_UBSAN
+#endif
+#ifndef OPENSSL_NO_UNIT_TEST
+# define OPENSSL_NO_UNIT_TEST
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+# define OPENSSL_NO_WEAK_SSL_CIPHERS
+#endif
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
+# define OPENSSL_NO_DYNAMIC_ENGINE
+#endif
+
+
+/*
+ * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
+ * don't like that.  This will hopefully silence them.
+ */
+#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
+
+/*
+ * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
+ * declarations of functions deprecated in or before <version>. Otherwise, they
+ * still won't see them if the library has been built to disable deprecated
+ * functions.
+ */
+#ifndef DECLARE_DEPRECATED
+# define DECLARE_DEPRECATED(f)   f;
+# ifdef __GNUC__
+#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
+# endif
+#endif
+
+#ifndef OPENSSL_FILE
+# ifdef OPENSSL_NO_FILENAMES
+#  define OPENSSL_FILE ""
+#  define OPENSSL_LINE 0
+# else
+#  define OPENSSL_FILE __FILE__
+#  define OPENSSL_LINE __LINE__
+# endif
+#endif
+
+#ifndef OPENSSL_MIN_API
+# define OPENSSL_MIN_API 0
+#endif
+
+#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
+# undef OPENSSL_API_COMPAT
+# define OPENSSL_API_COMPAT OPENSSL_MIN_API
+#endif
+
+/*
+ * Do not deprecate things to be deprecated in version 1.2.0 before the
+ * OpenSSL version number matches.
+ */
+#if OPENSSL_VERSION_NUMBER < 0x10200000L
+# define DEPRECATEDIN_1_2_0(f)   f;
+#elif OPENSSL_API_COMPAT < 0x10200000L
+# define DEPRECATEDIN_1_2_0(f)   DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_2_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x10100000L
+# define DEPRECATEDIN_1_1_0(f)   DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_1_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x10000000L
+# define DEPRECATEDIN_1_0_0(f)   DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_0_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x00908000L
+# define DEPRECATEDIN_0_9_8(f)   DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_0_9_8(f)
+#endif
+
+/* Generate 80386 code? */
+#undef I386_ONLY
+
+#undef OPENSSL_UNISTD
+#define OPENSSL_UNISTD <unistd.h>
+
+#define OPENSSL_EXPORT_VAR_AS_FUNCTION
+
+/*
+ * The following are cipher-specific, but are part of the public API.
+ */
+#if !defined(OPENSSL_SYS_UEFI)
+# define BN_LLONG
+/* Only one for the following should be defined */
+# undef SIXTY_FOUR_BIT_LONG
+# undef SIXTY_FOUR_BIT
+# define THIRTY_TWO_BIT
+#endif
+
+#define RC4_INT unsigned int
+
+#ifdef  __cplusplus
+}
+#endif
diff --git a/contrib/libs/openssl/include/openssl/opensslconf.h b/contrib/libs/openssl/include/openssl/opensslconf.h
index 7e99d1f2757..ecc930a39fb 100644
--- a/contrib/libs/openssl/include/openssl/opensslconf.h
+++ b/contrib/libs/openssl/include/openssl/opensslconf.h
@@ -23,9 +23,9 @@
 #elif defined(__linux__) && defined(__arm__)
 #   include "opensslconf-linux_arm.h"
 #elif defined(_MSC_VER) && defined(_M_X64)
-#   include "opensslconf-win-x86_64.h" 
-#elif defined(_MSC_VER) && defined(_M_IX86) 
-#   include "opensslconf-win-i686.h" 
+#   include "opensslconf-win-x86_64.h"
+#elif defined(_MSC_VER) && defined(_M_IX86)
+#   include "opensslconf-win-i686.h"
 #else
 #   include "opensslconf-linux.h"
 #endif