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

15 files changed, 386 insertions, 386 deletions

diff --git a/contrib/libs/openssl/apps/.yandex_meta/licenses.list.txt b/contrib/libs/openssl/apps/.yandex_meta/licenses.list.txt
index 682cd9dc76..cbb0974506 100644
--- a/contrib/libs/openssl/apps/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/openssl/apps/.yandex_meta/licenses.list.txt
@@ -1,257 +1,257 @@
-====================COPYRIGHT==================== 
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright (c) 2004, EdelKey Project. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright (c) 2013-2014 Timo Teräs <timo.teras@gmail.com> 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2004-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2005 Nokia. All rights reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2016 VMS Software, Inc. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================COPYRIGHT==================== 
- * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. 
- 
- 
-====================File: LICENSE==================== 
- 
-  LICENSE ISSUES 
-  ============== 
- 
-  The OpenSSL toolkit stays under a double license, i.e. both the conditions of 
-  the OpenSSL License and the original SSLeay license apply to the toolkit. 
-  See below for the actual license texts. 
- 
-  OpenSSL License 
-  --------------- 
- 
-/* ==================================================================== 
- * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- * 
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in 
- *    the documentation and/or other materials provided with the 
- *    distribution. 
- * 
- * 3. All advertising materials mentioning features or use of this 
- *    software must display the following acknowledgment: 
- *    "This product includes software developed by the OpenSSL Project 
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)" 
- * 
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to 
- *    endorse or promote products derived from this software without 
- *    prior written permission. For written permission, please contact 
- *    openssl-core@openssl.org. 
- * 
- * 5. Products derived from this software may not be called "OpenSSL" 
- *    nor may "OpenSSL" appear in their names without prior written 
- *    permission of the OpenSSL Project. 
- * 
- * 6. Redistributions of any form whatsoever must retain the following 
- *    acknowledgment: 
- *    "This product includes software developed by the OpenSSL Project 
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)" 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY 
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR 
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- * ==================================================================== 
- * 
- * This product includes cryptographic software written by Eric Young 
- * (eay@cryptsoft.com).  This product includes software written by Tim 
- * Hudson (tjh@cryptsoft.com). 
- * 
- */ 
- 
- Original SSLeay License 
- ----------------------- 
- 
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 
- * All rights reserved. 
- * 
- * This package is an SSL implementation written 
- * by Eric Young (eay@cryptsoft.com). 
- * The implementation was written so as to conform with Netscapes SSL. 
- * 
- * This library is free for commercial and non-commercial use as long as 
- * the following conditions are aheared to.  The following conditions 
- * apply to all code found in this distribution, be it the RC4, RSA, 
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation 
- * included with this distribution is covered by the same copyright terms 
- * except that the holder is Tim Hudson (tjh@cryptsoft.com). 
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in 
- * the code are not to be removed. 
- * If this package is used in a product, Eric Young should be given attribution 
- * as the author of the parts of the library used. 
- * This can be in the form of a textual message at program startup or 
- * in documentation (online or textual) provided with the package. 
- * 
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- * 1. Redistributions of source code must retain the copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
- * 3. All advertising materials mentioning features or use of this software 
- *    must display the following acknowledgement: 
- *    "This product includes cryptographic software written by 
- *     Eric Young (eay@cryptsoft.com)" 
- *    The word 'cryptographic' can be left out if the rouines from the library 
- *    being used are not cryptographic related :-). 
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement: 
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
- * 
- * The licence and distribution terms for any publically available version or 
- * derivative of this code cannot be changed.  i.e. this code cannot simply be 
- * copied and put under another distribution licence 
- * [including the GNU Public Licence.] 
- */ 
- 
- 
- 
-====================OpenSSL==================== 
- * 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 
- 
- 
-====================Public-Domain==================== 
- * (note that it's in the public domain) 
+====================COPYRIGHT====================
+ * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
+
+
+====================COPYRIGHT====================
+ * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright (c) 2013-2014 Timo Teräs <timo.teras@gmail.com>
+
+
+====================COPYRIGHT====================
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2004-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2005 Nokia. All rights reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2016 VMS Software, Inc. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================COPYRIGHT====================
+ * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
+
+
+====================File: LICENSE====================
+
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a double license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts.
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+
+
+====================OpenSSL====================
+ * 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
+
+
+====================Public-Domain====================
+ * (note that it's in the public domain)
diff --git a/contrib/libs/openssl/apps/ca.c b/contrib/libs/openssl/apps/ca.c
index 4dd5f71b2d..390ac37493 100644
--- a/contrib/libs/openssl/apps/ca.c
+++ b/contrib/libs/openssl/apps/ca.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2021 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
@@ -1862,8 +1862,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
     row[DB_exp_date][tm->length] = '\0';
     row[DB_rev_date] = NULL;
     row[DB_file] = OPENSSL_strdup("unknown");
-    if ((row[DB_type] == NULL) || (row[DB_file] == NULL) 
-        || (row[DB_name] == NULL)) { 
+    if ((row[DB_type] == NULL) || (row[DB_file] == NULL)
+        || (row[DB_name] == NULL)) {
         BIO_printf(bio_err, "Memory allocation failure\n");
         goto end;
     }
@@ -2223,17 +2223,17 @@ static int get_certificate_status(const char *serial, CA_DB *db)
 
 static int do_updatedb(CA_DB *db)
 {
-    ASN1_TIME *a_tm = NULL; 
+    ASN1_TIME *a_tm = NULL;
     int i, cnt = 0;
-    char **rrow; 
+    char **rrow;
 
-    a_tm = ASN1_TIME_new(); 
+    a_tm = ASN1_TIME_new();
     if (a_tm == NULL)
         return -1;
 
-    /* get actual time */ 
+    /* get actual time */
     if (X509_gmtime_adj(a_tm, 0) == NULL) {
-        ASN1_TIME_free(a_tm); 
+        ASN1_TIME_free(a_tm);
         return -1;
     }
 
@@ -2242,32 +2242,32 @@ static int do_updatedb(CA_DB *db)
 
         if (rrow[DB_type][0] == DB_TYPE_VAL) {
             /* ignore entries that are not valid */
-            ASN1_TIME *exp_date = NULL; 
-
-            exp_date = ASN1_TIME_new(); 
-            if (exp_date == NULL) { 
-                ASN1_TIME_free(a_tm); 
-                return -1; 
-            } 
-
-            if (!ASN1_TIME_set_string(exp_date, rrow[DB_exp_date])) { 
-                ASN1_TIME_free(a_tm); 
-                ASN1_TIME_free(exp_date); 
-                return -1; 
-            } 
- 
-            if (ASN1_TIME_compare(exp_date, a_tm) <= 0) { 
+            ASN1_TIME *exp_date = NULL;
+
+            exp_date = ASN1_TIME_new();
+            if (exp_date == NULL) {
+                ASN1_TIME_free(a_tm);
+                return -1;
+            }
+
+            if (!ASN1_TIME_set_string(exp_date, rrow[DB_exp_date])) {
+                ASN1_TIME_free(a_tm);
+                ASN1_TIME_free(exp_date);
+                return -1;
+            }
+
+            if (ASN1_TIME_compare(exp_date, a_tm) <= 0) {
                 rrow[DB_type][0] = DB_TYPE_EXP;
                 rrow[DB_type][1] = '\0';
                 cnt++;
 
                 BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]);
             }
-            ASN1_TIME_free(exp_date); 
+            ASN1_TIME_free(exp_date);
         }
     }
 
-    ASN1_TIME_free(a_tm); 
+    ASN1_TIME_free(a_tm);
     return cnt;
 }
 
diff --git a/contrib/libs/openssl/apps/cms.c b/contrib/libs/openssl/apps/cms.c
index 23994713c9..71554037d0 100644
--- a/contrib/libs/openssl/apps/cms.c
+++ b/contrib/libs/openssl/apps/cms.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 2008-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
@@ -545,10 +545,10 @@ int cms_main(int argc, char **argv)
             if (key_param == NULL || key_param->idx != keyidx) {
                 cms_key_param *nparam;
                 nparam = app_malloc(sizeof(*nparam), "key param buffer");
-                if ((nparam->param = sk_OPENSSL_STRING_new_null()) == NULL) { 
-                    OPENSSL_free(nparam); 
-                    goto end; 
-                } 
+                if ((nparam->param = sk_OPENSSL_STRING_new_null()) == NULL) {
+                    OPENSSL_free(nparam);
+                    goto end;
+                }
                 nparam->idx = keyidx;
                 nparam->next = NULL;
                 if (key_first == NULL)
diff --git a/contrib/libs/openssl/apps/crl2p7.c b/contrib/libs/openssl/apps/crl2p7.c
index 7939403caa..3f619bf527 100644
--- a/contrib/libs/openssl/apps/crl2p7.c
+++ b/contrib/libs/openssl/apps/crl2p7.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2021 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
@@ -120,19 +120,19 @@ int crl2pkcs7_main(int argc, char **argv)
 
     if (!ASN1_INTEGER_set(p7s->version, 1))
         goto end;
- 
+
     if (crl != NULL) {
-        if ((crl_stack = sk_X509_CRL_new_null()) == NULL) 
-            goto end; 
-        p7s->crl = crl_stack; 
+        if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
+            goto end;
+        p7s->crl = crl_stack;
         sk_X509_CRL_push(crl_stack, crl);
         crl = NULL;             /* now part of p7 for OPENSSL_freeing */
     }
 
-    if (certflst != NULL) { 
-        if ((cert_stack = sk_X509_new_null()) == NULL) 
-            goto end; 
-        p7s->cert = cert_stack; 
+    if (certflst != NULL) {
+        if ((cert_stack = sk_X509_new_null()) == NULL)
+            goto end;
+        p7s->cert = cert_stack;
 
         for (i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
             certfile = sk_OPENSSL_STRING_value(certflst, i);
@@ -142,7 +142,7 @@ int crl2pkcs7_main(int argc, char **argv)
                 goto end;
             }
         }
-    } 
+    }
 
     out = bio_open_default(outfile, 'w', outformat);
     if (out == NULL)
diff --git a/contrib/libs/openssl/apps/enc.c b/contrib/libs/openssl/apps/enc.c
index bd853b23de..65710771a0 100644
--- a/contrib/libs/openssl/apps/enc.c
+++ b/contrib/libs/openssl/apps/enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2021 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
@@ -81,7 +81,7 @@ const OPTIONS enc_options[] = {
     {"", OPT_CIPHER, '-', "Any supported cipher"},
     OPT_R_OPTIONS,
 #ifdef ZLIB
-    {"z", OPT_Z, '-', "Compress or decompress encrypted data using zlib"}, 
+    {"z", OPT_Z, '-', "Compress or decompress encrypted data using zlib"},
 #endif
 #ifndef OPENSSL_NO_ENGINE
     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
diff --git a/contrib/libs/openssl/apps/genpkey.c b/contrib/libs/openssl/apps/genpkey.c
index f7e076066b..3fe87e853c 100644
--- a/contrib/libs/openssl/apps/genpkey.c
+++ b/contrib/libs/openssl/apps/genpkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 2006-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
@@ -177,12 +177,12 @@ int genpkey_main(int argc, char **argv)
         goto end;
     }
 
-    ret = 0; 
- 
+    ret = 0;
+
     if (rv <= 0) {
         BIO_puts(bio_err, "Error writing key\n");
         ERR_print_errors(bio_err);
-        ret = 1; 
+        ret = 1;
     }
 
     if (text) {
@@ -194,7 +194,7 @@ int genpkey_main(int argc, char **argv)
         if (rv <= 0) {
             BIO_puts(bio_err, "Error printing key\n");
             ERR_print_errors(bio_err);
-            ret = 1; 
+            ret = 1;
         }
     }
 
diff --git a/contrib/libs/openssl/apps/progs-linux_aarch64-linux-osx_arm64.h b/contrib/libs/openssl/apps/progs-linux_aarch64-linux-osx_arm64.h
index 7e20fbd654..005abd2dd3 100644
--- a/contrib/libs/openssl/apps/progs-linux_aarch64-linux-osx_arm64.h
+++ b/contrib/libs/openssl/apps/progs-linux_aarch64-linux-osx_arm64.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2021 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
diff --git a/contrib/libs/openssl/apps/progs.h b/contrib/libs/openssl/apps/progs.h
index 6cb81237d0..a8b3e70a41 100644
--- a/contrib/libs/openssl/apps/progs.h
+++ b/contrib/libs/openssl/apps/progs.h
@@ -1,5 +1,5 @@
-#if defined(_MSC_VER) && defined(_M_X64) 
+#if defined(_MSC_VER) && defined(_M_X64)
 #   include "progs-win.h"
 #else
-#   include "progs-linux_aarch64-linux-osx_arm64.h" 
+#   include "progs-linux_aarch64-linux-osx_arm64.h"
 #endif
diff --git a/contrib/libs/openssl/apps/s_cb.c b/contrib/libs/openssl/apps/s_cb.c
index d8d89f3874..dee1b2e5b4 100644
--- a/contrib/libs/openssl/apps/s_cb.c
+++ b/contrib/libs/openssl/apps/s_cb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2021 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
@@ -934,8 +934,8 @@ static int set_cert_cb(SSL *ssl, void *arg)
                 if (!SSL_build_cert_chain(ssl, 0))
                     return 0;
             } else if (exc->chain != NULL) {
-                if (!SSL_set1_chain(ssl, exc->chain)) 
-                    return 0; 
+                if (!SSL_set1_chain(ssl, exc->chain))
+                    return 0;
             }
         }
         exc = exc->prev;
diff --git a/contrib/libs/openssl/apps/s_client.c b/contrib/libs/openssl/apps/s_client.c
index 9908ff8e38..83b3fc9c7f 100644
--- a/contrib/libs/openssl/apps/s_client.c
+++ b/contrib/libs/openssl/apps/s_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -1283,42 +1283,42 @@ int s_client_main(int argc, char **argv)
         case OPT_SSL3:
             min_version = SSL3_VERSION;
             max_version = SSL3_VERSION;
-            socket_type = SOCK_STREAM; 
-#ifndef OPENSSL_NO_DTLS 
-            isdtls = 0; 
-#endif 
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_TLS1_3:
             min_version = TLS1_3_VERSION;
             max_version = TLS1_3_VERSION;
-            socket_type = SOCK_STREAM; 
-#ifndef OPENSSL_NO_DTLS 
-            isdtls = 0; 
-#endif 
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_TLS1_2:
             min_version = TLS1_2_VERSION;
             max_version = TLS1_2_VERSION;
-            socket_type = SOCK_STREAM; 
-#ifndef OPENSSL_NO_DTLS 
-            isdtls = 0; 
-#endif 
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_TLS1_1:
             min_version = TLS1_1_VERSION;
             max_version = TLS1_1_VERSION;
-            socket_type = SOCK_STREAM; 
-#ifndef OPENSSL_NO_DTLS 
-            isdtls = 0; 
-#endif 
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_TLS1:
             min_version = TLS1_VERSION;
             max_version = TLS1_VERSION;
-            socket_type = SOCK_STREAM; 
-#ifndef OPENSSL_NO_DTLS 
-            isdtls = 0; 
-#endif 
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_DTLS:
 #ifndef OPENSSL_NO_DTLS
diff --git a/contrib/libs/openssl/apps/s_server.c b/contrib/libs/openssl/apps/s_server.c
index 9fd30324e0..938e244222 100644
--- a/contrib/libs/openssl/apps/s_server.c
+++ b/contrib/libs/openssl/apps/s_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -133,17 +133,17 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
 
     if (s_debug)
         BIO_printf(bio_s_out, "psk_server_cb\n");
- 
-    if (SSL_version(ssl) >= TLS1_3_VERSION) { 
-        /* 
-         * This callback is designed for use in TLSv1.2. It is possible to use 
-         * a single callback for all protocol versions - but it is preferred to 
-         * use a dedicated callback for TLSv1.3. For TLSv1.3 we have 
-         * psk_find_session_cb. 
-         */ 
-        return 0; 
-    } 
- 
+
+    if (SSL_version(ssl) >= TLS1_3_VERSION) {
+        /*
+         * This callback is designed for use in TLSv1.2. It is possible to use
+         * a single callback for all protocol versions - but it is preferred to
+         * use a dedicated callback for TLSv1.3. For TLSv1.3 we have
+         * psk_find_session_cb.
+         */
+        return 0;
+    }
+
     if (identity == NULL) {
         BIO_printf(bio_err, "Error: client did not send PSK identity\n");
         goto out_err;
diff --git a/contrib/libs/openssl/apps/s_socket.c b/contrib/libs/openssl/apps/s_socket.c
index 8f8235b0ce..aee366d5f4 100644
--- a/contrib/libs/openssl/apps/s_socket.c
+++ b/contrib/libs/openssl/apps/s_socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2021 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
@@ -214,8 +214,8 @@ int do_server(int *accept_sock, const char *host, const char *port,
     const BIO_ADDRINFO *next;
     int sock_family, sock_type, sock_protocol, sock_port;
     const BIO_ADDR *sock_address;
-    int sock_family_fallback = AF_UNSPEC; 
-    const BIO_ADDR *sock_address_fallback = NULL; 
+    int sock_family_fallback = AF_UNSPEC;
+    const BIO_ADDR *sock_address_fallback = NULL;
     int sock_options = BIO_SOCK_REUSEADDR;
     int ret = 0;
 
@@ -246,10 +246,10 @@ int do_server(int *accept_sock, const char *host, const char *port,
             && BIO_ADDRINFO_protocol(next) == sock_protocol) {
         if (sock_family == AF_INET
                 && BIO_ADDRINFO_family(next) == AF_INET6) {
-            /* In case AF_INET6 is returned but not supported by the 
-             * kernel, retry with the first detected address family */ 
-            sock_family_fallback = sock_family; 
-            sock_address_fallback = sock_address; 
+            /* In case AF_INET6 is returned but not supported by the
+             * kernel, retry with the first detected address family */
+            sock_family_fallback = sock_family;
+            sock_address_fallback = sock_address;
             sock_family = AF_INET6;
             sock_address = BIO_ADDRINFO_address(next);
         } else if (sock_family == AF_INET6
@@ -259,10 +259,10 @@ int do_server(int *accept_sock, const char *host, const char *port,
     }
 
     asock = BIO_socket(sock_family, sock_type, sock_protocol, 0);
-    if (asock == INVALID_SOCKET && sock_family_fallback != AF_UNSPEC) { 
-        asock = BIO_socket(sock_family_fallback, sock_type, sock_protocol, 0); 
-        sock_address = sock_address_fallback; 
-    } 
+    if (asock == INVALID_SOCKET && sock_family_fallback != AF_UNSPEC) {
+        asock = BIO_socket(sock_family_fallback, sock_type, sock_protocol, 0);
+        sock_address = sock_address_fallback;
+    }
     if (asock == INVALID_SOCKET
         || !BIO_listen(asock, sock_address, sock_options)) {
         BIO_ADDRINFO_free(res);
diff --git a/contrib/libs/openssl/apps/s_time.c b/contrib/libs/openssl/apps/s_time.c
index 8e9d29b2cd..1235e545c2 100644
--- a/contrib/libs/openssl/apps/s_time.c
+++ b/contrib/libs/openssl/apps/s_time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-2021 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
@@ -263,8 +263,8 @@ int s_time_main(int argc, char **argv)
          nConn, totalTime, ((double)nConn / totalTime), bytes_read);
     printf
         ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-         nConn, (long)time(NULL) - finishtime + maxtime, 
-         nConn > 0 ? bytes_read / nConn : 0l); 
+         nConn, (long)time(NULL) - finishtime + maxtime,
+         nConn > 0 ? bytes_read / nConn : 0l);
 
     /*
      * Now loop and time connections using the same session id over and over
diff --git a/contrib/libs/openssl/apps/x509.c b/contrib/libs/openssl/apps/x509.c
index 6b6aa6d625..1043eba0c8 100644
--- a/contrib/libs/openssl/apps/x509.c
+++ b/contrib/libs/openssl/apps/x509.c
@@ -140,8 +140,8 @@ const OPTIONS x509_options[] = {
     {"", OPT_MD, '-', "Any supported digest"},
 #ifndef OPENSSL_NO_MD5
     {"subject_hash_old", OPT_SUBJECT_HASH_OLD, '-',
-     "Print old-style (MD5) subject hash value"}, 
-    {"issuer_hash_old", OPT_ISSUER_HASH_OLD, '-', 
+     "Print old-style (MD5) subject hash value"},
+    {"issuer_hash_old", OPT_ISSUER_HASH_OLD, '-',
      "Print old-style (MD5) issuer hash value"},
 #endif
 #ifndef OPENSSL_NO_ENGINE
diff --git a/contrib/libs/openssl/apps/ya.make b/contrib/libs/openssl/apps/ya.make
index 4021c721ea..e6b81c6b18 100644
--- a/contrib/libs/openssl/apps/ya.make
+++ b/contrib/libs/openssl/apps/ya.make
@@ -1,17 +1,17 @@
 PROGRAM(openssl)
 
-OWNER( 
-    somov 
-    g:cpp-contrib 
-) 
-
-LICENSE( 
-    OpenSSL AND 
-    Public-Domain 
-) 
-
-LICENSE_TEXTS(.yandex_meta/licenses.list.txt) 
- 
+OWNER(
+    somov
+    g:cpp-contrib
+)
+
+LICENSE(
+    OpenSSL AND
+    Public-Domain
+)
+
+LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
+
 PEERDIR(
     contrib/libs/openssl
     contrib/libs/openssl/crypto
@@ -64,32 +64,32 @@ IF (OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH
 ENDIF()
 
 IF (OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64)
-    CFLAGS( 
-        -DOPENSSL_USE_NODELETE 
-    ) 
+    CFLAGS(
+        -DOPENSSL_USE_NODELETE
+    )
 ENDIF()
 
 IF (OS_DARWIN AND ARCH_X86_64)
-    CFLAGS( 
-        -D_REENTRANT 
-    ) 
+    CFLAGS(
+        -D_REENTRANT
+    )
+ENDIF()
+
+IF (OS_DARWIN AND ARCH_ARM64)
+    CFLAGS(
+        -DL_ENDIAN
+        -DOPENSSL_PIC
+        -D_REENTRANT
+    )
 ENDIF()
 
-IF (OS_DARWIN AND ARCH_ARM64) 
-    CFLAGS( 
-        -DL_ENDIAN 
-        -DOPENSSL_PIC 
-        -D_REENTRANT 
-    ) 
-ENDIF() 
- 
 IF (OS_WINDOWS)
     IF (ARCH_X86_64)
         CFLAGS(
             -DENGINESDIR="\"C:\\\\Program\ Files\\\\OpenSSL\\\\lib\\\\engines-1_1\""
             -DOPENSSLDIR="\"C:\\\\Program\ Files\\\\Common\ Files\\\\SSL\""
         )
-    ELSEIF (ARCH_I386) 
+    ELSEIF (ARCH_I386)
         CFLAGS(
             -DENGINESDIR="\"C:\\\\Program\ Files\ \(x86\)\\\\OpenSSL\\\\lib\\\\engines-1_1\""
             -DOPENSSLDIR="\"C:\\\\Program\ Files\ \(x86\)\\\\Common\ Files\\\\SSL\""