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

1 files changed, 220 insertions, 220 deletions

diff --git a/contrib/libs/openssl/ssl/ssl_init.c b/contrib/libs/openssl/ssl/ssl_init.c
index 14c4f6de754..d083d959709 100644
--- a/contrib/libs/openssl/ssl/ssl_init.c
+++ b/contrib/libs/openssl/ssl/ssl_init.c
@@ -1,221 +1,221 @@
-/* 
- * Copyright 2016-2019 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 "e_os.h" 
- 
-#include "internal/err.h" 
-#include <openssl/crypto.h> 
-#include <openssl/evp.h> 
+/*
+ * Copyright 2016-2019 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 "e_os.h"
+
+#include "internal/err.h"
+#include <openssl/crypto.h>
+#include <openssl/evp.h>
 #include "ssl_local.h"
-#include "internal/thread_once.h" 
- 
-static int stopped; 
- 
-static void ssl_library_stop(void); 
- 
-static CRYPTO_ONCE ssl_base = CRYPTO_ONCE_STATIC_INIT; 
-static int ssl_base_inited = 0; 
-DEFINE_RUN_ONCE_STATIC(ossl_init_ssl_base) 
-{ 
-#ifdef OPENSSL_INIT_DEBUG 
-    fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: " 
-            "Adding SSL ciphers and digests\n"); 
-#endif 
-#ifndef OPENSSL_NO_DES 
-    EVP_add_cipher(EVP_des_cbc()); 
-    EVP_add_cipher(EVP_des_ede3_cbc()); 
-#endif 
-#ifndef OPENSSL_NO_IDEA 
-    EVP_add_cipher(EVP_idea_cbc()); 
-#endif 
-#ifndef OPENSSL_NO_RC4 
-    EVP_add_cipher(EVP_rc4()); 
-# ifndef OPENSSL_NO_MD5 
-    EVP_add_cipher(EVP_rc4_hmac_md5()); 
-# endif 
-#endif 
-#ifndef OPENSSL_NO_RC2 
-    EVP_add_cipher(EVP_rc2_cbc()); 
-    /* 
-     * Not actually used for SSL/TLS but this makes PKCS#12 work if an 
-     * application only calls SSL_library_init(). 
-     */ 
-    EVP_add_cipher(EVP_rc2_40_cbc()); 
-#endif 
-    EVP_add_cipher(EVP_aes_128_cbc()); 
-    EVP_add_cipher(EVP_aes_192_cbc()); 
-    EVP_add_cipher(EVP_aes_256_cbc()); 
-    EVP_add_cipher(EVP_aes_128_gcm()); 
-    EVP_add_cipher(EVP_aes_256_gcm()); 
-    EVP_add_cipher(EVP_aes_128_ccm()); 
-    EVP_add_cipher(EVP_aes_256_ccm()); 
-    EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1()); 
-    EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1()); 
-    EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256()); 
-    EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256()); 
-#ifndef OPENSSL_NO_ARIA 
-    EVP_add_cipher(EVP_aria_128_gcm()); 
-    EVP_add_cipher(EVP_aria_256_gcm()); 
-#endif 
-#ifndef OPENSSL_NO_CAMELLIA 
-    EVP_add_cipher(EVP_camellia_128_cbc()); 
-    EVP_add_cipher(EVP_camellia_256_cbc()); 
-#endif 
-#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) 
-    EVP_add_cipher(EVP_chacha20_poly1305()); 
-#endif 
- 
-#ifndef OPENSSL_NO_SEED 
-    EVP_add_cipher(EVP_seed_cbc()); 
-#endif 
- 
-#ifndef OPENSSL_NO_MD5 
-    EVP_add_digest(EVP_md5()); 
-    EVP_add_digest_alias(SN_md5, "ssl3-md5"); 
-    EVP_add_digest(EVP_md5_sha1()); 
-#endif 
-    EVP_add_digest(EVP_sha1()); /* RSA with sha1 */ 
-    EVP_add_digest_alias(SN_sha1, "ssl3-sha1"); 
-    EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA); 
-    EVP_add_digest(EVP_sha224()); 
-    EVP_add_digest(EVP_sha256()); 
-    EVP_add_digest(EVP_sha384()); 
-    EVP_add_digest(EVP_sha512()); 
-#ifndef OPENSSL_NO_COMP 
-# ifdef OPENSSL_INIT_DEBUG 
-    fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: " 
-            "SSL_COMP_get_compression_methods()\n"); 
-# endif 
-    /* 
-     * This will initialise the built-in compression algorithms. The value 
-     * returned is a STACK_OF(SSL_COMP), but that can be discarded safely 
-     */ 
-    SSL_COMP_get_compression_methods(); 
-#endif 
-    /* initialize cipher/digest methods table */ 
-    if (!ssl_load_ciphers()) 
-        return 0; 
- 
-#ifdef OPENSSL_INIT_DEBUG 
-    fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: " 
-            "SSL_add_ssl_module()\n"); 
-#endif 
-    /* 
-     * We ignore an error return here. Not much we can do - but not that bad 
-     * either. We can still safely continue. 
-     */ 
-    OPENSSL_atexit(ssl_library_stop); 
-    ssl_base_inited = 1; 
-    return 1; 
-} 
- 
-static CRYPTO_ONCE ssl_strings = CRYPTO_ONCE_STATIC_INIT; 
-static int ssl_strings_inited = 0; 
-DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings) 
-{ 
-    /* 
-     * OPENSSL_NO_AUTOERRINIT is provided here to prevent at compile time 
-     * pulling in all the error strings during static linking 
-     */ 
-#if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT) 
-# ifdef OPENSSL_INIT_DEBUG 
-    fprintf(stderr, "OPENSSL_INIT: ossl_init_load_ssl_strings: " 
-            "ERR_load_SSL_strings()\n"); 
-# endif 
-    ERR_load_SSL_strings(); 
-    ssl_strings_inited = 1; 
-#endif 
-    return 1; 
-} 
- 
-DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_load_ssl_strings, 
-                           ossl_init_load_ssl_strings) 
-{ 
-    /* Do nothing in this case */ 
-    return 1; 
-} 
- 
-static void ssl_library_stop(void) 
-{ 
-    /* Might be explicitly called and also by atexit */ 
-    if (stopped) 
-        return; 
-    stopped = 1; 
- 
-    if (ssl_base_inited) { 
-#ifndef OPENSSL_NO_COMP 
-# ifdef OPENSSL_INIT_DEBUG 
-        fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " 
-                "ssl_comp_free_compression_methods_int()\n"); 
-# endif 
-        ssl_comp_free_compression_methods_int(); 
-#endif 
-    } 
- 
-    if (ssl_strings_inited) { 
-#ifdef OPENSSL_INIT_DEBUG 
-        fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " 
-                "err_free_strings_int()\n"); 
-#endif 
-        /* 
-         * If both crypto and ssl error strings are inited we will end up 
-         * calling err_free_strings_int() twice - but that's ok. The second 
-         * time will be a no-op. It's easier to do that than to try and track 
-         * between the two libraries whether they have both been inited. 
-         */ 
-        err_free_strings_int(); 
-    } 
-} 
- 
-/* 
- * If this function is called with a non NULL settings value then it must be 
- * called prior to any threads making calls to any OpenSSL functions, 
- * i.e. passing a non-null settings value is assumed to be single-threaded. 
- */ 
-int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS * settings) 
-{ 
-    static int stoperrset = 0; 
- 
-    if (stopped) { 
-        if (!stoperrset) { 
-            /* 
-             * We only ever set this once to avoid getting into an infinite 
-             * loop where the error system keeps trying to init and fails so 
-             * sets an error etc 
-             */ 
-            stoperrset = 1; 
-            SSLerr(SSL_F_OPENSSL_INIT_SSL, ERR_R_INIT_FAIL); 
-        } 
-        return 0; 
-    } 
- 
-    opts |= OPENSSL_INIT_ADD_ALL_CIPHERS 
-         |  OPENSSL_INIT_ADD_ALL_DIGESTS; 
-#ifndef OPENSSL_NO_AUTOLOAD_CONFIG 
-    if ((opts & OPENSSL_INIT_NO_LOAD_CONFIG) == 0) 
-        opts |= OPENSSL_INIT_LOAD_CONFIG; 
-#endif 
- 
-    if (!OPENSSL_init_crypto(opts, settings)) 
-        return 0; 
- 
-    if (!RUN_ONCE(&ssl_base, ossl_init_ssl_base)) 
-        return 0; 
- 
-    if ((opts & OPENSSL_INIT_NO_LOAD_SSL_STRINGS) 
-        && !RUN_ONCE_ALT(&ssl_strings, ossl_init_no_load_ssl_strings, 
-                         ossl_init_load_ssl_strings)) 
-        return 0; 
- 
-    if ((opts & OPENSSL_INIT_LOAD_SSL_STRINGS) 
-        && !RUN_ONCE(&ssl_strings, ossl_init_load_ssl_strings)) 
-        return 0; 
- 
-    return 1; 
-} 
+#include "internal/thread_once.h"
+
+static int stopped;
+
+static void ssl_library_stop(void);
+
+static CRYPTO_ONCE ssl_base = CRYPTO_ONCE_STATIC_INIT;
+static int ssl_base_inited = 0;
+DEFINE_RUN_ONCE_STATIC(ossl_init_ssl_base)
+{
+#ifdef OPENSSL_INIT_DEBUG
+    fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: "
+            "Adding SSL ciphers and digests\n");
+#endif
+#ifndef OPENSSL_NO_DES
+    EVP_add_cipher(EVP_des_cbc());
+    EVP_add_cipher(EVP_des_ede3_cbc());
+#endif
+#ifndef OPENSSL_NO_IDEA
+    EVP_add_cipher(EVP_idea_cbc());
+#endif
+#ifndef OPENSSL_NO_RC4
+    EVP_add_cipher(EVP_rc4());
+# ifndef OPENSSL_NO_MD5
+    EVP_add_cipher(EVP_rc4_hmac_md5());
+# endif
+#endif
+#ifndef OPENSSL_NO_RC2
+    EVP_add_cipher(EVP_rc2_cbc());
+    /*
+     * Not actually used for SSL/TLS but this makes PKCS#12 work if an
+     * application only calls SSL_library_init().
+     */
+    EVP_add_cipher(EVP_rc2_40_cbc());
+#endif
+    EVP_add_cipher(EVP_aes_128_cbc());
+    EVP_add_cipher(EVP_aes_192_cbc());
+    EVP_add_cipher(EVP_aes_256_cbc());
+    EVP_add_cipher(EVP_aes_128_gcm());
+    EVP_add_cipher(EVP_aes_256_gcm());
+    EVP_add_cipher(EVP_aes_128_ccm());
+    EVP_add_cipher(EVP_aes_256_ccm());
+    EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
+    EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
+    EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256());
+    EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256());
+#ifndef OPENSSL_NO_ARIA
+    EVP_add_cipher(EVP_aria_128_gcm());
+    EVP_add_cipher(EVP_aria_256_gcm());
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    EVP_add_cipher(EVP_camellia_128_cbc());
+    EVP_add_cipher(EVP_camellia_256_cbc());
+#endif
+#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
+    EVP_add_cipher(EVP_chacha20_poly1305());
+#endif
+
+#ifndef OPENSSL_NO_SEED
+    EVP_add_cipher(EVP_seed_cbc());
+#endif
+
+#ifndef OPENSSL_NO_MD5
+    EVP_add_digest(EVP_md5());
+    EVP_add_digest_alias(SN_md5, "ssl3-md5");
+    EVP_add_digest(EVP_md5_sha1());
+#endif
+    EVP_add_digest(EVP_sha1()); /* RSA with sha1 */
+    EVP_add_digest_alias(SN_sha1, "ssl3-sha1");
+    EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA);
+    EVP_add_digest(EVP_sha224());
+    EVP_add_digest(EVP_sha256());
+    EVP_add_digest(EVP_sha384());
+    EVP_add_digest(EVP_sha512());
+#ifndef OPENSSL_NO_COMP
+# ifdef OPENSSL_INIT_DEBUG
+    fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: "
+            "SSL_COMP_get_compression_methods()\n");
+# endif
+    /*
+     * This will initialise the built-in compression algorithms. The value
+     * returned is a STACK_OF(SSL_COMP), but that can be discarded safely
+     */
+    SSL_COMP_get_compression_methods();
+#endif
+    /* initialize cipher/digest methods table */
+    if (!ssl_load_ciphers())
+        return 0;
+
+#ifdef OPENSSL_INIT_DEBUG
+    fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: "
+            "SSL_add_ssl_module()\n");
+#endif
+    /*
+     * We ignore an error return here. Not much we can do - but not that bad
+     * either. We can still safely continue.
+     */
+    OPENSSL_atexit(ssl_library_stop);
+    ssl_base_inited = 1;
+    return 1;
+}
+
+static CRYPTO_ONCE ssl_strings = CRYPTO_ONCE_STATIC_INIT;
+static int ssl_strings_inited = 0;
+DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings)
+{
+    /*
+     * OPENSSL_NO_AUTOERRINIT is provided here to prevent at compile time
+     * pulling in all the error strings during static linking
+     */
+#if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT)
+# ifdef OPENSSL_INIT_DEBUG
+    fprintf(stderr, "OPENSSL_INIT: ossl_init_load_ssl_strings: "
+            "ERR_load_SSL_strings()\n");
+# endif
+    ERR_load_SSL_strings();
+    ssl_strings_inited = 1;
+#endif
+    return 1;
+}
+
+DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_load_ssl_strings,
+                           ossl_init_load_ssl_strings)
+{
+    /* Do nothing in this case */
+    return 1;
+}
+
+static void ssl_library_stop(void)
+{
+    /* Might be explicitly called and also by atexit */
+    if (stopped)
+        return;
+    stopped = 1;
+
+    if (ssl_base_inited) {
+#ifndef OPENSSL_NO_COMP
+# ifdef OPENSSL_INIT_DEBUG
+        fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: "
+                "ssl_comp_free_compression_methods_int()\n");
+# endif
+        ssl_comp_free_compression_methods_int();
+#endif
+    }
+
+    if (ssl_strings_inited) {
+#ifdef OPENSSL_INIT_DEBUG
+        fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: "
+                "err_free_strings_int()\n");
+#endif
+        /*
+         * If both crypto and ssl error strings are inited we will end up
+         * calling err_free_strings_int() twice - but that's ok. The second
+         * time will be a no-op. It's easier to do that than to try and track
+         * between the two libraries whether they have both been inited.
+         */
+        err_free_strings_int();
+    }
+}
+
+/*
+ * If this function is called with a non NULL settings value then it must be
+ * called prior to any threads making calls to any OpenSSL functions,
+ * i.e. passing a non-null settings value is assumed to be single-threaded.
+ */
+int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS * settings)
+{
+    static int stoperrset = 0;
+
+    if (stopped) {
+        if (!stoperrset) {
+            /*
+             * We only ever set this once to avoid getting into an infinite
+             * loop where the error system keeps trying to init and fails so
+             * sets an error etc
+             */
+            stoperrset = 1;
+            SSLerr(SSL_F_OPENSSL_INIT_SSL, ERR_R_INIT_FAIL);
+        }
+        return 0;
+    }
+
+    opts |= OPENSSL_INIT_ADD_ALL_CIPHERS
+         |  OPENSSL_INIT_ADD_ALL_DIGESTS;
+#ifndef OPENSSL_NO_AUTOLOAD_CONFIG
+    if ((opts & OPENSSL_INIT_NO_LOAD_CONFIG) == 0)
+        opts |= OPENSSL_INIT_LOAD_CONFIG;
+#endif
+
+    if (!OPENSSL_init_crypto(opts, settings))
+        return 0;
+
+    if (!RUN_ONCE(&ssl_base, ossl_init_ssl_base))
+        return 0;
+
+    if ((opts & OPENSSL_INIT_NO_LOAD_SSL_STRINGS)
+        && !RUN_ONCE_ALT(&ssl_strings, ossl_init_no_load_ssl_strings,
+                         ossl_init_load_ssl_strings))
+        return 0;
+
+    if ((opts & OPENSSL_INIT_LOAD_SSL_STRINGS)
+        && !RUN_ONCE(&ssl_strings, ossl_init_load_ssl_strings))
+        return 0;
+
+    return 1;
+}