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

17 files changed, 249 insertions, 249 deletions

diff --git a/contrib/libs/openssl/apps/apps.c b/contrib/libs/openssl/apps/apps.c
index 9d527ad32a..c06241abb9 100644
--- a/contrib/libs/openssl/apps/apps.c
+++ b/contrib/libs/openssl/apps/apps.c
@@ -47,14 +47,14 @@ static int WIN32_rename(const char *from, const char *to);
 # define rename(from,to) WIN32_rename((from),(to))
 #endif
 
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) 
-# include <conio.h> 
-#endif 
- 
-#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32) 
-# define _kbhit kbhit 
-#endif 
- 
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
+# include <conio.h>
+#endif
+
+#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
+# define _kbhit kbhit
+#endif
+
 typedef struct {
     const char *name;
     unsigned long flag;
diff --git a/contrib/libs/openssl/apps/apps.h b/contrib/libs/openssl/apps/apps.h
index 57ca289dd1..34c3fd8633 100644
--- a/contrib/libs/openssl/apps/apps.h
+++ b/contrib/libs/openssl/apps/apps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-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
diff --git a/contrib/libs/openssl/apps/asn1pars.c b/contrib/libs/openssl/apps/asn1pars.c
index d7593ed193..6c44df7de4 100644
--- a/contrib/libs/openssl/apps/asn1pars.c
+++ b/contrib/libs/openssl/apps/asn1pars.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-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
@@ -170,16 +170,16 @@ int asn1parse_main(int argc, char **argv)
     if (derfile && (derout = bio_open_default(derfile, 'w', FORMAT_ASN1)) == NULL)
         goto end;
 
-    if ((buf = BUF_MEM_new()) == NULL) 
-        goto end; 
+    if ((buf = BUF_MEM_new()) == NULL)
+        goto end;
     if (strictpem) {
-        if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { 
+        if (PEM_read_bio(in, &name, &header, &str, &num) != 1) {
             BIO_printf(bio_err, "Error reading PEM file\n");
             ERR_print_errors(bio_err);
             goto end;
         }
-        buf->data = (char *)str; 
-        buf->length = buf->max = num; 
+        buf->data = (char *)str;
+        buf->length = buf->max = num;
     } else {
         if (!BUF_MEM_grow(buf, BUFSIZ * 8))
             goto end;           /* Pre-allocate :-) */
diff --git a/contrib/libs/openssl/apps/ca.c b/contrib/libs/openssl/apps/ca.c
index 13a3c9782f..390ac37493 100644
--- a/contrib/libs/openssl/apps/ca.c
+++ b/contrib/libs/openssl/apps/ca.c
@@ -722,7 +722,7 @@ end_of_options:
 
     /*****************************************************************/
     if (req || gencrl) {
-        if (spkac_file != NULL && outfile != NULL) { 
+        if (spkac_file != NULL && outfile != NULL) {
             output_der = 1;
             batch = 1;
         }
diff --git a/contrib/libs/openssl/apps/cms.c b/contrib/libs/openssl/apps/cms.c
index 117f0caeef..71554037d0 100644
--- a/contrib/libs/openssl/apps/cms.c
+++ b/contrib/libs/openssl/apps/cms.c
@@ -638,7 +638,7 @@ int cms_main(int argc, char **argv)
             goto opthelp;
         }
     } else if (!operation) {
-        BIO_printf(bio_err, "No operation option (-encrypt|-decrypt|-sign|-verify|...) specified.\n"); 
+        BIO_printf(bio_err, "No operation option (-encrypt|-decrypt|-sign|-verify|...) specified.\n");
         goto opthelp;
     }
 
diff --git a/contrib/libs/openssl/apps/dgst.c b/contrib/libs/openssl/apps/dgst.c
index 322ccc88e1..e595f7d818 100644
--- a/contrib/libs/openssl/apps/dgst.c
+++ b/contrib/libs/openssl/apps/dgst.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-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
@@ -505,7 +505,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
     int i, backslash = 0, ret = 1;
     unsigned char *sigbuf = NULL;
 
-    while (BIO_pending(bp) || !BIO_eof(bp)) { 
+    while (BIO_pending(bp) || !BIO_eof(bp)) {
         i = BIO_read(bp, (char *)buf, BUFSIZE);
         if (i < 0) {
             BIO_printf(bio_err, "Read Error in %s\n", file);
diff --git a/contrib/libs/openssl/apps/enc.c b/contrib/libs/openssl/apps/enc.c
index 282de3018e..65710771a0 100644
--- a/contrib/libs/openssl/apps/enc.c
+++ b/contrib/libs/openssl/apps/enc.c
@@ -501,7 +501,7 @@ int enc_main(int argc, char **argv)
         if (hiv != NULL) {
             int siz = EVP_CIPHER_iv_length(cipher);
             if (siz == 0) {
-                BIO_printf(bio_err, "warning: iv not used by this cipher\n"); 
+                BIO_printf(bio_err, "warning: iv not used by this cipher\n");
             } else if (!set_hex(hiv, iv, siz)) {
                 BIO_printf(bio_err, "invalid hex iv value\n");
                 goto end;
@@ -587,7 +587,7 @@ int enc_main(int argc, char **argv)
     if (benc != NULL)
         wbio = BIO_push(benc, wbio);
 
-    while (BIO_pending(rbio) || !BIO_eof(rbio)) { 
+    while (BIO_pending(rbio) || !BIO_eof(rbio)) {
         inl = BIO_read(rbio, (char *)buff, bsize);
         if (inl <= 0)
             break;
diff --git a/contrib/libs/openssl/apps/ocsp.c b/contrib/libs/openssl/apps/ocsp.c
index 6e10e15114..27ec94fa6b 100644
--- a/contrib/libs/openssl/apps/ocsp.c
+++ b/contrib/libs/openssl/apps/ocsp.c
@@ -638,10 +638,10 @@ redo_accept:
         goto end;
     }
 
-    if (req != NULL && add_nonce) { 
-        if (!OCSP_request_add1_nonce(req, NULL, -1)) 
-            goto end; 
-    } 
+    if (req != NULL && add_nonce) {
+        if (!OCSP_request_add1_nonce(req, NULL, -1))
+            goto end;
+    }
 
     if (signfile != NULL) {
         if (keyfile == NULL)
@@ -1244,10 +1244,10 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
             goto end;
         }
     }
-    if (!OCSP_basic_sign_ctx(bs, rcert, mctx, rother, flags)) { 
-        *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR, bs); 
-        goto end; 
-    } 
+    if (!OCSP_basic_sign_ctx(bs, rcert, mctx, rother, flags)) {
+        *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR, bs);
+        goto end;
+    }
 
     if (badsig) {
         const ASN1_OCTET_STRING *sig = OCSP_resp_get0_signature(bs);
@@ -1413,11 +1413,11 @@ static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
         *q = '\0';
 
         /*
-         * Skip "GET / HTTP..." requests often used by load-balancers.  Note: 
-         * 'p' was incremented above to point to the first byte *after* the 
-         * leading slash, so with 'GET / ' it is now an empty string. 
+         * Skip "GET / HTTP..." requests often used by load-balancers.  Note:
+         * 'p' was incremented above to point to the first byte *after* the
+         * leading slash, so with 'GET / ' it is now an empty string.
          */
-        if (p[0] == '\0') 
+        if (p[0] == '\0')
             goto out;
 
         len = urldecode(p);
diff --git a/contrib/libs/openssl/apps/openssl.c b/contrib/libs/openssl/apps/openssl.c
index fda6437723..ff7b759a40 100644
--- a/contrib/libs/openssl/apps/openssl.c
+++ b/contrib/libs/openssl/apps/openssl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-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
diff --git a/contrib/libs/openssl/apps/pkcs12.c b/contrib/libs/openssl/apps/pkcs12.c
index 3f62b572fd..8c5d963b8c 100644
--- a/contrib/libs/openssl/apps/pkcs12.c
+++ b/contrib/libs/openssl/apps/pkcs12.c
@@ -835,7 +835,7 @@ static int alg_print(const X509_ALGOR *alg)
                 goto done;
             }
             BIO_printf(bio_err, ", Salt length: %d, Cost(N): %ld, "
-                       "Block size(r): %ld, Parallelism(p): %ld", 
+                       "Block size(r): %ld, Parallelism(p): %ld",
                        ASN1_STRING_length(kdf->salt),
                        ASN1_INTEGER_get(kdf->costParameter),
                        ASN1_INTEGER_get(kdf->blockSize),
diff --git a/contrib/libs/openssl/apps/req.c b/contrib/libs/openssl/apps/req.c
index 8fef35e8b6..a603907cd5 100644
--- a/contrib/libs/openssl/apps/req.c
+++ b/contrib/libs/openssl/apps/req.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-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
@@ -886,19 +886,19 @@ int req_main(int argc, char **argv)
 
     if (text) {
         if (x509)
-            ret = X509_print_ex(out, x509ss, get_nameopt(), reqflag); 
+            ret = X509_print_ex(out, x509ss, get_nameopt(), reqflag);
         else
-            ret = X509_REQ_print_ex(out, req, get_nameopt(), reqflag); 
- 
-        if (ret == 0) { 
-            if (x509) 
-              BIO_printf(bio_err, "Error printing certificate\n"); 
-            else 
-              BIO_printf(bio_err, "Error printing certificate request\n"); 
- 
-            ERR_print_errors(bio_err); 
-            goto end; 
-        } 
+            ret = X509_REQ_print_ex(out, req, get_nameopt(), reqflag);
+
+        if (ret == 0) {
+            if (x509)
+              BIO_printf(bio_err, "Error printing certificate\n");
+            else
+              BIO_printf(bio_err, "Error printing certificate request\n");
+
+            ERR_print_errors(bio_err);
+            goto end;
+        }
     }
 
     if (subject) {
diff --git a/contrib/libs/openssl/apps/s_apps.h b/contrib/libs/openssl/apps/s_apps.h
index 24cd1858d4..f94e659e71 100644
--- a/contrib/libs/openssl/apps/s_apps.h
+++ b/contrib/libs/openssl/apps/s_apps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 1995-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
@@ -9,7 +9,7 @@
 
 #include <openssl/opensslconf.h>
 
-#include <openssl/ssl.h> 
+#include <openssl/ssl.h>
 
 #define PORT            "4433"
 #define PROTOCOL        "tcp"
@@ -18,9 +18,9 @@ typedef int (*do_server_cb)(int s, int stype, int prot, unsigned char *context);
 int do_server(int *accept_sock, const char *host, const char *port,
               int family, int type, int protocol, do_server_cb cb,
               unsigned char *context, int naccept, BIO *bio_s_out);
- 
+
 int verify_callback(int ok, X509_STORE_CTX *ctx);
- 
+
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
                        STACK_OF(X509) *chain, int build_chain);
diff --git a/contrib/libs/openssl/apps/s_cb.c b/contrib/libs/openssl/apps/s_cb.c
index af67579448..dee1b2e5b4 100644
--- a/contrib/libs/openssl/apps/s_cb.c
+++ b/contrib/libs/openssl/apps/s_cb.c
@@ -684,53 +684,53 @@ static STRINT_PAIR tlsext_types[] = {
     {NULL}
 };
 
-/* from rfc8446 4.2.3. + gost (https://tools.ietf.org/id/draft-smyshlyaev-tls12-gost-suites-04.html) */ 
-static STRINT_PAIR signature_tls13_scheme_list[] = { 
-    {"rsa_pkcs1_sha1",         0x0201 /* TLSEXT_SIGALG_rsa_pkcs1_sha1 */}, 
-    {"ecdsa_sha1",             0x0203 /* TLSEXT_SIGALG_ecdsa_sha1 */}, 
-/*  {"rsa_pkcs1_sha224",       0x0301    TLSEXT_SIGALG_rsa_pkcs1_sha224}, not in rfc8446 */ 
-/*  {"ecdsa_sha224",           0x0303    TLSEXT_SIGALG_ecdsa_sha224}      not in rfc8446 */ 
-    {"rsa_pkcs1_sha256",       0x0401 /* TLSEXT_SIGALG_rsa_pkcs1_sha256 */}, 
-    {"ecdsa_secp256r1_sha256", 0x0403 /* TLSEXT_SIGALG_ecdsa_secp256r1_sha256 */}, 
-    {"rsa_pkcs1_sha384",       0x0501 /* TLSEXT_SIGALG_rsa_pkcs1_sha384 */}, 
-    {"ecdsa_secp384r1_sha384", 0x0503 /* TLSEXT_SIGALG_ecdsa_secp384r1_sha384 */}, 
-    {"rsa_pkcs1_sha512",       0x0601 /* TLSEXT_SIGALG_rsa_pkcs1_sha512 */}, 
-    {"ecdsa_secp521r1_sha512", 0x0603 /* TLSEXT_SIGALG_ecdsa_secp521r1_sha512 */}, 
-    {"rsa_pss_rsae_sha256",    0x0804 /* TLSEXT_SIGALG_rsa_pss_rsae_sha256 */}, 
-    {"rsa_pss_rsae_sha384",    0x0805 /* TLSEXT_SIGALG_rsa_pss_rsae_sha384 */}, 
-    {"rsa_pss_rsae_sha512",    0x0806 /* TLSEXT_SIGALG_rsa_pss_rsae_sha512 */}, 
-    {"ed25519",                0x0807 /* TLSEXT_SIGALG_ed25519 */}, 
-    {"ed448",                  0x0808 /* TLSEXT_SIGALG_ed448 */}, 
-    {"rsa_pss_pss_sha256",     0x0809 /* TLSEXT_SIGALG_rsa_pss_pss_sha256 */}, 
-    {"rsa_pss_pss_sha384",     0x080a /* TLSEXT_SIGALG_rsa_pss_pss_sha384 */}, 
-    {"rsa_pss_pss_sha512",     0x080b /* TLSEXT_SIGALG_rsa_pss_pss_sha512 */}, 
-    {"gostr34102001",          0xeded /* TLSEXT_SIGALG_gostr34102001_gostr3411 */}, 
-    {"gostr34102012_256",      0xeeee /* TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256 */}, 
-    {"gostr34102012_512",      0xefef /* TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512 */}, 
-    {NULL} 
-}; 
- 
-/* from rfc5246 7.4.1.4.1. */ 
-static STRINT_PAIR signature_tls12_alg_list[] = { 
-    {"anonymous", TLSEXT_signature_anonymous /* 0 */}, 
-    {"RSA",       TLSEXT_signature_rsa       /* 1 */}, 
-    {"DSA",       TLSEXT_signature_dsa       /* 2 */}, 
-    {"ECDSA",     TLSEXT_signature_ecdsa     /* 3 */}, 
-    {NULL} 
-}; 
- 
-/* from rfc5246 7.4.1.4.1. */ 
-static STRINT_PAIR signature_tls12_hash_list[] = { 
-    {"none",   TLSEXT_hash_none   /* 0 */}, 
-    {"MD5",    TLSEXT_hash_md5    /* 1 */}, 
-    {"SHA1",   TLSEXT_hash_sha1   /* 2 */}, 
-    {"SHA224", TLSEXT_hash_sha224 /* 3 */}, 
-    {"SHA256", TLSEXT_hash_sha256 /* 4 */}, 
-    {"SHA384", TLSEXT_hash_sha384 /* 5 */}, 
-    {"SHA512", TLSEXT_hash_sha512 /* 6 */}, 
-    {NULL} 
-}; 
- 
+/* from rfc8446 4.2.3. + gost (https://tools.ietf.org/id/draft-smyshlyaev-tls12-gost-suites-04.html) */
+static STRINT_PAIR signature_tls13_scheme_list[] = {
+    {"rsa_pkcs1_sha1",         0x0201 /* TLSEXT_SIGALG_rsa_pkcs1_sha1 */},
+    {"ecdsa_sha1",             0x0203 /* TLSEXT_SIGALG_ecdsa_sha1 */},
+/*  {"rsa_pkcs1_sha224",       0x0301    TLSEXT_SIGALG_rsa_pkcs1_sha224}, not in rfc8446 */
+/*  {"ecdsa_sha224",           0x0303    TLSEXT_SIGALG_ecdsa_sha224}      not in rfc8446 */
+    {"rsa_pkcs1_sha256",       0x0401 /* TLSEXT_SIGALG_rsa_pkcs1_sha256 */},
+    {"ecdsa_secp256r1_sha256", 0x0403 /* TLSEXT_SIGALG_ecdsa_secp256r1_sha256 */},
+    {"rsa_pkcs1_sha384",       0x0501 /* TLSEXT_SIGALG_rsa_pkcs1_sha384 */},
+    {"ecdsa_secp384r1_sha384", 0x0503 /* TLSEXT_SIGALG_ecdsa_secp384r1_sha384 */},
+    {"rsa_pkcs1_sha512",       0x0601 /* TLSEXT_SIGALG_rsa_pkcs1_sha512 */},
+    {"ecdsa_secp521r1_sha512", 0x0603 /* TLSEXT_SIGALG_ecdsa_secp521r1_sha512 */},
+    {"rsa_pss_rsae_sha256",    0x0804 /* TLSEXT_SIGALG_rsa_pss_rsae_sha256 */},
+    {"rsa_pss_rsae_sha384",    0x0805 /* TLSEXT_SIGALG_rsa_pss_rsae_sha384 */},
+    {"rsa_pss_rsae_sha512",    0x0806 /* TLSEXT_SIGALG_rsa_pss_rsae_sha512 */},
+    {"ed25519",                0x0807 /* TLSEXT_SIGALG_ed25519 */},
+    {"ed448",                  0x0808 /* TLSEXT_SIGALG_ed448 */},
+    {"rsa_pss_pss_sha256",     0x0809 /* TLSEXT_SIGALG_rsa_pss_pss_sha256 */},
+    {"rsa_pss_pss_sha384",     0x080a /* TLSEXT_SIGALG_rsa_pss_pss_sha384 */},
+    {"rsa_pss_pss_sha512",     0x080b /* TLSEXT_SIGALG_rsa_pss_pss_sha512 */},
+    {"gostr34102001",          0xeded /* TLSEXT_SIGALG_gostr34102001_gostr3411 */},
+    {"gostr34102012_256",      0xeeee /* TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256 */},
+    {"gostr34102012_512",      0xefef /* TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512 */},
+    {NULL}
+};
+
+/* from rfc5246 7.4.1.4.1. */
+static STRINT_PAIR signature_tls12_alg_list[] = {
+    {"anonymous", TLSEXT_signature_anonymous /* 0 */},
+    {"RSA",       TLSEXT_signature_rsa       /* 1 */},
+    {"DSA",       TLSEXT_signature_dsa       /* 2 */},
+    {"ECDSA",     TLSEXT_signature_ecdsa     /* 3 */},
+    {NULL}
+};
+
+/* from rfc5246 7.4.1.4.1. */
+static STRINT_PAIR signature_tls12_hash_list[] = {
+    {"none",   TLSEXT_hash_none   /* 0 */},
+    {"MD5",    TLSEXT_hash_md5    /* 1 */},
+    {"SHA1",   TLSEXT_hash_sha1   /* 2 */},
+    {"SHA224", TLSEXT_hash_sha224 /* 3 */},
+    {"SHA256", TLSEXT_hash_sha256 /* 4 */},
+    {"SHA384", TLSEXT_hash_sha384 /* 5 */},
+    {"SHA512", TLSEXT_hash_sha512 /* 6 */},
+    {NULL}
+};
+
 void tlsext_cb(SSL *s, int client_server, int type,
                const unsigned char *data, int len, void *arg)
 {
@@ -1331,9 +1331,9 @@ static STRINT_PAIR callback_types[] = {
     {"Supported Curve", SSL_SECOP_CURVE_SUPPORTED},
     {"Shared Curve", SSL_SECOP_CURVE_SHARED},
     {"Check Curve", SSL_SECOP_CURVE_CHECK},
-    {"Supported Signature Algorithm", SSL_SECOP_SIGALG_SUPPORTED}, 
-    {"Shared Signature Algorithm", SSL_SECOP_SIGALG_SHARED}, 
-    {"Check Signature Algorithm", SSL_SECOP_SIGALG_CHECK}, 
+    {"Supported Signature Algorithm", SSL_SECOP_SIGALG_SUPPORTED},
+    {"Shared Signature Algorithm", SSL_SECOP_SIGALG_SHARED},
+    {"Check Signature Algorithm", SSL_SECOP_SIGALG_CHECK},
     {"Signature Algorithm mask", SSL_SECOP_SIGALG_MASK},
     {"Certificate chain EE key", SSL_SECOP_EE_KEY},
     {"Certificate chain CA key", SSL_SECOP_CA_KEY},
@@ -1353,37 +1353,37 @@ static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
     security_debug_ex *sdb = ex;
     int rv, show_bits = 1, cert_md = 0;
     const char *nm;
-    int show_nm; 
+    int show_nm;
     rv = sdb->old_cb(s, ctx, op, bits, nid, other, ex);
     if (rv == 1 && sdb->verbose < 2)
         return 1;
     BIO_puts(sdb->out, "Security callback: ");
 
     nm = lookup(op, callback_types, NULL);
-    show_nm = nm != NULL; 
+    show_nm = nm != NULL;
     switch (op) {
     case SSL_SECOP_TICKET:
     case SSL_SECOP_COMPRESSION:
         show_bits = 0;
-        show_nm = 0; 
+        show_nm = 0;
         break;
     case SSL_SECOP_VERSION:
         BIO_printf(sdb->out, "Version=%s", lookup(nid, ssl_versions, "???"));
         show_bits = 0;
-        show_nm = 0; 
+        show_nm = 0;
         break;
     case SSL_SECOP_CA_MD:
     case SSL_SECOP_PEER_CA_MD:
         cert_md = 1;
         break;
-    case SSL_SECOP_SIGALG_SUPPORTED: 
-    case SSL_SECOP_SIGALG_SHARED: 
-    case SSL_SECOP_SIGALG_CHECK: 
-    case SSL_SECOP_SIGALG_MASK: 
-        show_nm = 0; 
-        break; 
+    case SSL_SECOP_SIGALG_SUPPORTED:
+    case SSL_SECOP_SIGALG_SHARED:
+    case SSL_SECOP_SIGALG_CHECK:
+    case SSL_SECOP_SIGALG_MASK:
+        show_nm = 0;
+        break;
     }
-    if (show_nm) 
+    if (show_nm)
         BIO_printf(sdb->out, "%s=", nm);
 
     switch (op & SSL_SECOP_OTHER_TYPE) {
@@ -1430,28 +1430,28 @@ static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
         {
             const unsigned char *salg = other;
             const char *sname = NULL;
-            int raw_sig_code = (salg[0] << 8) + salg[1]; /* always big endian (msb, lsb) */ 
-                /* raw_sig_code: signature_scheme from tls1.3, or signature_and_hash from tls1.2 */ 
+            int raw_sig_code = (salg[0] << 8) + salg[1]; /* always big endian (msb, lsb) */
+                /* raw_sig_code: signature_scheme from tls1.3, or signature_and_hash from tls1.2 */
 
-            if (nm != NULL) 
-                BIO_printf(sdb->out, "%s", nm); 
+            if (nm != NULL)
+                BIO_printf(sdb->out, "%s", nm);
             else
-                BIO_printf(sdb->out, "s_cb.c:security_callback_debug op=0x%x", op); 
- 
-            sname = lookup(raw_sig_code, signature_tls13_scheme_list, NULL); 
-            if (sname != NULL) { 
-                BIO_printf(sdb->out, " scheme=%s", sname); 
-            } else { 
-                int alg_code = salg[1]; 
-                int hash_code = salg[0]; 
-                const char *alg_str = lookup(alg_code, signature_tls12_alg_list, NULL); 
-                const char *hash_str = lookup(hash_code, signature_tls12_hash_list, NULL); 
- 
-                if (alg_str != NULL && hash_str != NULL) 
-                    BIO_printf(sdb->out, " digest=%s, algorithm=%s", hash_str, alg_str); 
-                else 
-                    BIO_printf(sdb->out, " scheme=unknown(0x%04x)", raw_sig_code); 
-            } 
+                BIO_printf(sdb->out, "s_cb.c:security_callback_debug op=0x%x", op);
+
+            sname = lookup(raw_sig_code, signature_tls13_scheme_list, NULL);
+            if (sname != NULL) {
+                BIO_printf(sdb->out, " scheme=%s", sname);
+            } else {
+                int alg_code = salg[1];
+                int hash_code = salg[0];
+                const char *alg_str = lookup(alg_code, signature_tls12_alg_list, NULL);
+                const char *hash_str = lookup(hash_code, signature_tls12_hash_list, NULL);
+
+                if (alg_str != NULL && hash_str != NULL)
+                    BIO_printf(sdb->out, " digest=%s, algorithm=%s", hash_str, alg_str);
+                else
+                    BIO_printf(sdb->out, " scheme=unknown(0x%04x)", raw_sig_code);
+            }
         }
 
     }
@@ -1527,8 +1527,8 @@ void print_ca_names(BIO *bio, SSL *s)
     int i;
 
     if (sk == NULL || sk_X509_NAME_num(sk) == 0) {
-        if (!SSL_is_server(s)) 
-            BIO_printf(bio, "---\nNo %s certificate CA names sent\n", cs); 
+        if (!SSL_is_server(s))
+            BIO_printf(bio, "---\nNo %s certificate CA names sent\n", cs);
         return;
     }
 
diff --git a/contrib/libs/openssl/apps/s_client.c b/contrib/libs/openssl/apps/s_client.c
index 1e7414ec57..83b3fc9c7f 100644
--- a/contrib/libs/openssl/apps/s_client.c
+++ b/contrib/libs/openssl/apps/s_client.c
@@ -2273,7 +2273,7 @@ int s_client_main(int argc, char **argv)
             do {
                 mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
             }
-            while (mbuf_len > 3 && (!isdigit(mbuf[0]) || !isdigit(mbuf[1]) || !isdigit(mbuf[2]) || mbuf[3] != ' ')); 
+            while (mbuf_len > 3 && (!isdigit(mbuf[0]) || !isdigit(mbuf[1]) || !isdigit(mbuf[2]) || mbuf[3] != ' '));
             (void)BIO_flush(fbio);
             BIO_pop(fbio);
             BIO_free(fbio);
@@ -2365,7 +2365,7 @@ int s_client_main(int argc, char **argv)
             (void)BIO_flush(fbio);
             /*
              * The first line is the HTTP response.  According to RFC 7230,
-             * it's formatted exactly like this: 
+             * it's formatted exactly like this:
              *
              * HTTP/d.d ddd Reason text\r\n
              */
diff --git a/contrib/libs/openssl/apps/speed.c b/contrib/libs/openssl/apps/speed.c
index b5228bdc81..d4ae7ab7bf 100644
--- a/contrib/libs/openssl/apps/speed.c
+++ b/contrib/libs/openssl/apps/speed.c
@@ -489,35 +489,35 @@ static const OPT_PAIR rsa_choices[] = {
 static double rsa_results[RSA_NUM][2];  /* 2 ops: sign then verify */
 #endif /* OPENSSL_NO_RSA */
 
-enum { 
-    R_EC_P160, 
-    R_EC_P192, 
-    R_EC_P224, 
-    R_EC_P256, 
-    R_EC_P384, 
-    R_EC_P521, 
-#ifndef OPENSSL_NO_EC2M 
-    R_EC_K163, 
-    R_EC_K233, 
-    R_EC_K283, 
-    R_EC_K409, 
-    R_EC_K571, 
-    R_EC_B163, 
-    R_EC_B233, 
-    R_EC_B283, 
-    R_EC_B409, 
-    R_EC_B571, 
-#endif 
-    R_EC_BRP256R1, 
-    R_EC_BRP256T1, 
-    R_EC_BRP384R1, 
-    R_EC_BRP384T1, 
-    R_EC_BRP512R1, 
-    R_EC_BRP512T1, 
-    R_EC_X25519, 
-    R_EC_X448 
-}; 
- 
+enum {
+    R_EC_P160,
+    R_EC_P192,
+    R_EC_P224,
+    R_EC_P256,
+    R_EC_P384,
+    R_EC_P521,
+#ifndef OPENSSL_NO_EC2M
+    R_EC_K163,
+    R_EC_K233,
+    R_EC_K283,
+    R_EC_K409,
+    R_EC_K571,
+    R_EC_B163,
+    R_EC_B233,
+    R_EC_B283,
+    R_EC_B409,
+    R_EC_B571,
+#endif
+    R_EC_BRP256R1,
+    R_EC_BRP256T1,
+    R_EC_BRP384R1,
+    R_EC_BRP384T1,
+    R_EC_BRP512R1,
+    R_EC_BRP512T1,
+    R_EC_X25519,
+    R_EC_X448
+};
+
 #ifndef OPENSSL_NO_EC
 static OPT_PAIR ecdsa_choices[] = {
     {"ecdsap160", R_EC_P160},
@@ -526,7 +526,7 @@ static OPT_PAIR ecdsa_choices[] = {
     {"ecdsap256", R_EC_P256},
     {"ecdsap384", R_EC_P384},
     {"ecdsap521", R_EC_P521},
-# ifndef OPENSSL_NO_EC2M 
+# ifndef OPENSSL_NO_EC2M
     {"ecdsak163", R_EC_K163},
     {"ecdsak233", R_EC_K233},
     {"ecdsak283", R_EC_K283},
@@ -537,7 +537,7 @@ static OPT_PAIR ecdsa_choices[] = {
     {"ecdsab283", R_EC_B283},
     {"ecdsab409", R_EC_B409},
     {"ecdsab571", R_EC_B571},
-# endif 
+# endif
     {"ecdsabrp256r1", R_EC_BRP256R1},
     {"ecdsabrp256t1", R_EC_BRP256T1},
     {"ecdsabrp384r1", R_EC_BRP384R1},
@@ -556,7 +556,7 @@ static const OPT_PAIR ecdh_choices[] = {
     {"ecdhp256", R_EC_P256},
     {"ecdhp384", R_EC_P384},
     {"ecdhp521", R_EC_P521},
-# ifndef OPENSSL_NO_EC2M 
+# ifndef OPENSSL_NO_EC2M
     {"ecdhk163", R_EC_K163},
     {"ecdhk233", R_EC_K233},
     {"ecdhk283", R_EC_K283},
@@ -567,7 +567,7 @@ static const OPT_PAIR ecdh_choices[] = {
     {"ecdhb283", R_EC_B283},
     {"ecdhb409", R_EC_B409},
     {"ecdhb571", R_EC_B571},
-# endif 
+# endif
     {"ecdhbrp256r1", R_EC_BRP256R1},
     {"ecdhbrp256t1", R_EC_BRP256T1},
     {"ecdhbrp384r1", R_EC_BRP384R1},
@@ -1508,7 +1508,7 @@ int speed_main(int argc, char **argv)
         {"nistp256", NID_X9_62_prime256v1, 256},
         {"nistp384", NID_secp384r1, 384},
         {"nistp521", NID_secp521r1, 521},
-# ifndef OPENSSL_NO_EC2M 
+# ifndef OPENSSL_NO_EC2M
         /* Binary Curves */
         {"nistk163", NID_sect163k1, 163},
         {"nistk233", NID_sect233k1, 233},
@@ -1520,7 +1520,7 @@ int speed_main(int argc, char **argv)
         {"nistb283", NID_sect283r1, 283},
         {"nistb409", NID_sect409r1, 409},
         {"nistb571", NID_sect571r1, 571},
-# endif 
+# endif
         {"brainpoolP256r1", NID_brainpoolP256r1, 256},
         {"brainpoolP256t1", NID_brainpoolP256t1, 256},
         {"brainpoolP384r1", NID_brainpoolP384r1, 384},
@@ -1788,7 +1788,7 @@ int speed_main(int argc, char **argv)
         }
 
         buflen = lengths[size_num - 1];
-        if (buflen < 36)    /* size of random vector in RSA benchmark */ 
+        if (buflen < 36)    /* size of random vector in RSA benchmark */
             buflen = 36;
         buflen += MAX_MISALIGNMENT + 1;
         loopargs[i].buf_malloc = app_malloc(buflen, "input buffer");
@@ -2040,7 +2040,7 @@ int speed_main(int argc, char **argv)
             }
         }
     }
-#   ifndef OPENSSL_NO_EC2M 
+#   ifndef OPENSSL_NO_EC2M
     ecdsa_c[R_EC_K163][0] = count / 1000;
     ecdsa_c[R_EC_K163][1] = count / 1000 / 2;
     for (i = R_EC_K233; i <= R_EC_K571; i++) {
@@ -2069,7 +2069,7 @@ int speed_main(int argc, char **argv)
             }
         }
     }
-#   endif 
+#   endif
 
     ecdh_c[R_EC_P160][0] = count / 1000;
     for (i = R_EC_P192; i <= R_EC_P521; i++) {
@@ -2082,7 +2082,7 @@ int speed_main(int argc, char **argv)
             }
         }
     }
-#   ifndef OPENSSL_NO_EC2M 
+#   ifndef OPENSSL_NO_EC2M
     ecdh_c[R_EC_K163][0] = count / 1000;
     for (i = R_EC_K233; i <= R_EC_K571; i++) {
         ecdh_c[i][0] = ecdh_c[i - 1][0] / 2;
@@ -2105,7 +2105,7 @@ int speed_main(int argc, char **argv)
             }
         }
     }
-#   endif 
+#   endif
     /* repeated code good to factorize */
     ecdh_c[R_EC_BRP256R1][0] = count / 1000;
     for (i = R_EC_BRP384R1; i <= R_EC_BRP512R1; i += 2) {
@@ -2627,28 +2627,28 @@ int speed_main(int argc, char **argv)
 
                 for (k = 0; k < loopargs_len; k++) {
                     loopargs[k].ctx = EVP_CIPHER_CTX_new();
-                    if (loopargs[k].ctx == NULL) { 
-                        BIO_printf(bio_err, "\nEVP_CIPHER_CTX_new failure\n"); 
-                        exit(1); 
-                    } 
-                    if (!EVP_CipherInit_ex(loopargs[k].ctx, evp_cipher, NULL, 
-                                           NULL, iv, decrypt ? 0 : 1)) { 
-                        BIO_printf(bio_err, "\nEVP_CipherInit_ex failure\n"); 
-                        ERR_print_errors(bio_err); 
-                        exit(1); 
-                    } 
+                    if (loopargs[k].ctx == NULL) {
+                        BIO_printf(bio_err, "\nEVP_CIPHER_CTX_new failure\n");
+                        exit(1);
+                    }
+                    if (!EVP_CipherInit_ex(loopargs[k].ctx, evp_cipher, NULL,
+                                           NULL, iv, decrypt ? 0 : 1)) {
+                        BIO_printf(bio_err, "\nEVP_CipherInit_ex failure\n");
+                        ERR_print_errors(bio_err);
+                        exit(1);
+                    }
 
                     EVP_CIPHER_CTX_set_padding(loopargs[k].ctx, 0);
 
                     keylen = EVP_CIPHER_CTX_key_length(loopargs[k].ctx);
                     loopargs[k].key = app_malloc(keylen, "evp_cipher key");
                     EVP_CIPHER_CTX_rand_key(loopargs[k].ctx, loopargs[k].key);
-                    if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL, 
-                                           loopargs[k].key, NULL, -1)) { 
-                        BIO_printf(bio_err, "\nEVP_CipherInit_ex failure\n"); 
-                        ERR_print_errors(bio_err); 
-                        exit(1); 
-                    } 
+                    if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL,
+                                           loopargs[k].key, NULL, -1)) {
+                        BIO_printf(bio_err, "\nEVP_CipherInit_ex failure\n");
+                        ERR_print_errors(bio_err);
+                        exit(1);
+                    }
                     OPENSSL_clear_free(loopargs[k].key, keylen);
                 }
 
diff --git a/contrib/libs/openssl/apps/storeutl.c b/contrib/libs/openssl/apps/storeutl.c
index 1002e10ca4..644fe28499 100644
--- a/contrib/libs/openssl/apps/storeutl.c
+++ b/contrib/libs/openssl/apps/storeutl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. 
+ * 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
@@ -125,7 +125,7 @@ int storeutl_main(int argc, char *argv[])
                 }
                 /*
                  * If expected wasn't set at this point, it means the map
-                 * isn't synchronised with the possible options leading here. 
+                 * isn't synchronised with the possible options leading here.
                  */
                 OPENSSL_assert(expected != 0);
             }
diff --git a/contrib/libs/openssl/apps/ya.make b/contrib/libs/openssl/apps/ya.make
index 6114cfd675..e6b81c6b18 100644
--- a/contrib/libs/openssl/apps/ya.make
+++ b/contrib/libs/openssl/apps/ya.make
@@ -107,64 +107,64 @@ IF (OS_WINDOWS)
 ENDIF()
 
 SRCS(
-    app_rand.c 
-    apps.c 
-    asn1pars.c 
-    bf_prefix.c 
-    ca.c 
-    ciphers.c 
-    cms.c 
-    crl.c 
-    crl2p7.c 
-    dgst.c 
-    dhparam.c 
-    dsa.c 
-    dsaparam.c 
-    ec.c 
-    ecparam.c 
-    enc.c 
-    engine.c 
-    errstr.c 
-    gendsa.c 
-    genpkey.c 
-    genrsa.c 
-    nseq.c 
-    ocsp.c 
-    openssl.c 
-    opt.c 
-    passwd.c 
-    pkcs12.c 
-    pkcs7.c 
-    pkcs8.c 
-    pkey.c 
-    pkeyparam.c 
-    pkeyutl.c 
-    prime.c 
-    rand.c 
-    rehash.c 
-    req.c 
-    rsa.c 
-    rsautl.c 
-    s_cb.c 
-    s_client.c 
-    s_server.c 
-    s_socket.c 
-    s_time.c 
-    sess_id.c 
-    smime.c 
-    speed.c 
-    spkac.c 
-    srp.c 
-    storeutl.c 
-    ts.c 
-    verify.c 
-    version.c 
-    x509.c 
+    app_rand.c
+    apps.c
+    asn1pars.c
+    bf_prefix.c
+    ca.c
+    ciphers.c
+    cms.c
+    crl.c
+    crl2p7.c
+    dgst.c
+    dhparam.c
+    dsa.c
+    dsaparam.c
+    ec.c
+    ecparam.c
+    enc.c
+    engine.c
+    errstr.c
+    gendsa.c
+    genpkey.c
+    genrsa.c
+    nseq.c
+    ocsp.c
+    openssl.c
+    opt.c
+    passwd.c
+    pkcs12.c
+    pkcs7.c
+    pkcs8.c
+    pkey.c
+    pkeyparam.c
+    pkeyutl.c
+    prime.c
+    rand.c
+    rehash.c
+    req.c
+    rsa.c
+    rsautl.c
+    s_cb.c
+    s_client.c
+    s_server.c
+    s_socket.c
+    s_time.c
+    sess_id.c
+    smime.c
+    speed.c
+    spkac.c
+    srp.c
+    storeutl.c
+    ts.c
+    verify.c
+    version.c
+    x509.c
 )
 
 IF (OS_WINDOWS)
     SRCS(
-        win32_init.c 
+        win32_init.c
     )
 ENDIF()