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

10 files changed, 228 insertions, 228 deletions

diff --git a/contrib/libs/openssl/crypto/ts/ts_asn1.c b/contrib/libs/openssl/crypto/ts/ts_asn1.c
index dd8eaa20e9..2840f5858a 100644
--- a/contrib/libs/openssl/crypto/ts/ts_asn1.c
+++ b/contrib/libs/openssl/crypto/ts/ts_asn1.c
@@ -10,7 +10,7 @@
 #include <openssl/ts.h>
 #include <openssl/err.h>
 #include <openssl/asn1t.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 ASN1_SEQUENCE(TS_MSG_IMPRINT) = {
         ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR),
diff --git a/contrib/libs/openssl/crypto/ts/ts_lib.c b/contrib/libs/openssl/crypto/ts/ts_lib.c
index 64ad851451..bfe981364b 100644
--- a/contrib/libs/openssl/crypto/ts/ts_lib.c
+++ b/contrib/libs/openssl/crypto/ts/ts_lib.c
@@ -14,7 +14,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num)
 {
diff --git a/contrib/libs/openssl/crypto/ts/ts_local.h b/contrib/libs/openssl/crypto/ts/ts_local.h
index 06a146c15b..771784fef7 100644
--- a/contrib/libs/openssl/crypto/ts/ts_local.h
+++ b/contrib/libs/openssl/crypto/ts/ts_local.h
@@ -1,211 +1,211 @@
-/* 
- * Copyright 2015-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 
- */ 
- 
-/*- 
- * MessageImprint ::= SEQUENCE  { 
- *      hashAlgorithm                AlgorithmIdentifier, 
- *      hashedMessage                OCTET STRING  } 
- */ 
-struct TS_msg_imprint_st { 
-    X509_ALGOR *hash_algo; 
-    ASN1_OCTET_STRING *hashed_msg; 
-}; 
- 
-/*- 
- * TimeStampResp ::= SEQUENCE  { 
- *     status                  PKIStatusInfo, 
- *     timeStampToken          TimeStampToken     OPTIONAL } 
- */ 
-struct TS_resp_st { 
-    TS_STATUS_INFO *status_info; 
-    PKCS7 *token; 
-    TS_TST_INFO *tst_info; 
-}; 
- 
-/*- 
- * TimeStampReq ::= SEQUENCE  { 
- *    version                  INTEGER  { v1(1) }, 
- *    messageImprint           MessageImprint, 
- *      --a hash algorithm OID and the hash value of the data to be 
- *      --time-stamped 
- *    reqPolicy                TSAPolicyId                OPTIONAL, 
- *    nonce                    INTEGER                    OPTIONAL, 
- *    certReq                  BOOLEAN                    DEFAULT FALSE, 
- *    extensions               [0] IMPLICIT Extensions    OPTIONAL  } 
- */ 
-struct TS_req_st { 
-    ASN1_INTEGER *version; 
-    TS_MSG_IMPRINT *msg_imprint; 
-    ASN1_OBJECT *policy_id; 
-    ASN1_INTEGER *nonce; 
-    ASN1_BOOLEAN cert_req; 
-    STACK_OF(X509_EXTENSION) *extensions; 
-}; 
- 
-/*- 
- * Accuracy ::= SEQUENCE { 
- *                 seconds        INTEGER           OPTIONAL, 
- *                 millis     [0] INTEGER  (1..999) OPTIONAL, 
- *                 micros     [1] INTEGER  (1..999) OPTIONAL  } 
- */ 
-struct TS_accuracy_st { 
-    ASN1_INTEGER *seconds; 
-    ASN1_INTEGER *millis; 
-    ASN1_INTEGER *micros; 
-}; 
- 
-/*- 
- * TSTInfo ::= SEQUENCE  { 
- *     version                      INTEGER  { v1(1) }, 
- *     policy                       TSAPolicyId, 
- *     messageImprint               MessageImprint, 
- *       -- MUST have the same value as the similar field in 
- *       -- TimeStampReq 
- *     serialNumber                 INTEGER, 
- *      -- Time-Stamping users MUST be ready to accommodate integers 
- *      -- up to 160 bits. 
- *     genTime                      GeneralizedTime, 
- *     accuracy                     Accuracy                 OPTIONAL, 
- *     ordering                     BOOLEAN             DEFAULT FALSE, 
- *     nonce                        INTEGER                  OPTIONAL, 
- *       -- MUST be present if the similar field was present 
- *       -- in TimeStampReq.  In that case it MUST have the same value. 
- *     tsa                          [0] GeneralName          OPTIONAL, 
- *     extensions                   [1] IMPLICIT Extensions  OPTIONAL   } 
- */ 
-struct TS_tst_info_st { 
-    ASN1_INTEGER *version; 
-    ASN1_OBJECT *policy_id; 
-    TS_MSG_IMPRINT *msg_imprint; 
-    ASN1_INTEGER *serial; 
-    ASN1_GENERALIZEDTIME *time; 
-    TS_ACCURACY *accuracy; 
-    ASN1_BOOLEAN ordering; 
-    ASN1_INTEGER *nonce; 
-    GENERAL_NAME *tsa; 
-    STACK_OF(X509_EXTENSION) *extensions; 
-}; 
- 
-struct TS_status_info_st { 
-    ASN1_INTEGER *status; 
-    STACK_OF(ASN1_UTF8STRING) *text; 
-    ASN1_BIT_STRING *failure_info; 
-}; 
- 
-/*- 
- * IssuerSerial ::= SEQUENCE { 
- *         issuer                   GeneralNames, 
- *         serialNumber             CertificateSerialNumber 
- *         } 
- */ 
-struct ESS_issuer_serial { 
-    STACK_OF(GENERAL_NAME) *issuer; 
-    ASN1_INTEGER *serial; 
-}; 
- 
-/*- 
- * ESSCertID ::=  SEQUENCE { 
- *         certHash                 Hash, 
- *         issuerSerial             IssuerSerial OPTIONAL 
- * } 
- */ 
-struct ESS_cert_id { 
-    ASN1_OCTET_STRING *hash;    /* Always SHA-1 digest. */ 
-    ESS_ISSUER_SERIAL *issuer_serial; 
-}; 
- 
-/*- 
- * SigningCertificate ::=  SEQUENCE { 
- *        certs        SEQUENCE OF ESSCertID, 
- *        policies     SEQUENCE OF PolicyInformation OPTIONAL 
- * } 
- */ 
-struct ESS_signing_cert { 
-    STACK_OF(ESS_CERT_ID) *cert_ids; 
-    STACK_OF(POLICYINFO) *policy_info; 
-}; 
- 
-/*- 
- * ESSCertIDv2 ::=  SEQUENCE { 
- *        hashAlgorithm           AlgorithmIdentifier 
- *                DEFAULT {algorithm id-sha256}, 
- *        certHash                Hash, 
- *        issuerSerial            IssuerSerial OPTIONAL 
- * } 
- */ 
- 
-struct ESS_cert_id_v2_st { 
-    X509_ALGOR *hash_alg;       /* Default: SHA-256 */ 
-    ASN1_OCTET_STRING *hash; 
-    ESS_ISSUER_SERIAL *issuer_serial; 
-}; 
- 
-/*- 
- * SigningCertificateV2 ::= SEQUENCE { 
- *        certs                   SEQUENCE OF ESSCertIDv2, 
- *        policies                SEQUENCE OF PolicyInformation OPTIONAL 
- * } 
- */ 
- 
-struct ESS_signing_cert_v2_st { 
-    STACK_OF(ESS_CERT_ID_V2) *cert_ids; 
-    STACK_OF(POLICYINFO) *policy_info; 
-}; 
- 
- 
-struct TS_resp_ctx { 
-    X509 *signer_cert; 
-    EVP_PKEY *signer_key; 
-    const EVP_MD *signer_md; 
-    const EVP_MD *ess_cert_id_digest; 
-    STACK_OF(X509) *certs;      /* Certs to include in signed data. */ 
-    STACK_OF(ASN1_OBJECT) *policies; /* Acceptable policies. */ 
-    ASN1_OBJECT *default_policy; /* It may appear in policies, too. */ 
-    STACK_OF(EVP_MD) *mds;      /* Acceptable message digests. */ 
-    ASN1_INTEGER *seconds;      /* accuracy, 0 means not specified. */ 
-    ASN1_INTEGER *millis;       /* accuracy, 0 means not specified. */ 
-    ASN1_INTEGER *micros;       /* accuracy, 0 means not specified. */ 
-    unsigned clock_precision_digits; /* fraction of seconds in time stamp 
-                                      * token. */ 
-    unsigned flags;             /* Optional info, see values above. */ 
-    /* Callback functions. */ 
-    TS_serial_cb serial_cb; 
-    void *serial_cb_data;       /* User data for serial_cb. */ 
-    TS_time_cb time_cb; 
-    void *time_cb_data;         /* User data for time_cb. */ 
-    TS_extension_cb extension_cb; 
-    void *extension_cb_data;    /* User data for extension_cb. */ 
-    /* These members are used only while creating the response. */ 
-    TS_REQ *request; 
-    TS_RESP *response; 
-    TS_TST_INFO *tst_info; 
-}; 
- 
-struct TS_verify_ctx { 
-    /* Set this to the union of TS_VFY_... flags you want to carry out. */ 
-    unsigned flags; 
-    /* Must be set only with TS_VFY_SIGNATURE. certs is optional. */ 
-    X509_STORE *store; 
-    STACK_OF(X509) *certs; 
-    /* Must be set only with TS_VFY_POLICY. */ 
-    ASN1_OBJECT *policy; 
-    /* 
-     * Must be set only with TS_VFY_IMPRINT. If md_alg is NULL, the 
-     * algorithm from the response is used. 
-     */ 
-    X509_ALGOR *md_alg; 
-    unsigned char *imprint; 
-    unsigned imprint_len; 
-    /* Must be set only with TS_VFY_DATA. */ 
-    BIO *data; 
-    /* Must be set only with TS_VFY_TSA_NAME. */ 
-    ASN1_INTEGER *nonce; 
-    /* Must be set only with TS_VFY_TSA_NAME. */ 
-    GENERAL_NAME *tsa_name; 
-}; 
+/*
+ * Copyright 2015-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
+ */
+
+/*-
+ * MessageImprint ::= SEQUENCE  {
+ *      hashAlgorithm                AlgorithmIdentifier,
+ *      hashedMessage                OCTET STRING  }
+ */
+struct TS_msg_imprint_st {
+    X509_ALGOR *hash_algo;
+    ASN1_OCTET_STRING *hashed_msg;
+};
+
+/*-
+ * TimeStampResp ::= SEQUENCE  {
+ *     status                  PKIStatusInfo,
+ *     timeStampToken          TimeStampToken     OPTIONAL }
+ */
+struct TS_resp_st {
+    TS_STATUS_INFO *status_info;
+    PKCS7 *token;
+    TS_TST_INFO *tst_info;
+};
+
+/*-
+ * TimeStampReq ::= SEQUENCE  {
+ *    version                  INTEGER  { v1(1) },
+ *    messageImprint           MessageImprint,
+ *      --a hash algorithm OID and the hash value of the data to be
+ *      --time-stamped
+ *    reqPolicy                TSAPolicyId                OPTIONAL,
+ *    nonce                    INTEGER                    OPTIONAL,
+ *    certReq                  BOOLEAN                    DEFAULT FALSE,
+ *    extensions               [0] IMPLICIT Extensions    OPTIONAL  }
+ */
+struct TS_req_st {
+    ASN1_INTEGER *version;
+    TS_MSG_IMPRINT *msg_imprint;
+    ASN1_OBJECT *policy_id;
+    ASN1_INTEGER *nonce;
+    ASN1_BOOLEAN cert_req;
+    STACK_OF(X509_EXTENSION) *extensions;
+};
+
+/*-
+ * Accuracy ::= SEQUENCE {
+ *                 seconds        INTEGER           OPTIONAL,
+ *                 millis     [0] INTEGER  (1..999) OPTIONAL,
+ *                 micros     [1] INTEGER  (1..999) OPTIONAL  }
+ */
+struct TS_accuracy_st {
+    ASN1_INTEGER *seconds;
+    ASN1_INTEGER *millis;
+    ASN1_INTEGER *micros;
+};
+
+/*-
+ * TSTInfo ::= SEQUENCE  {
+ *     version                      INTEGER  { v1(1) },
+ *     policy                       TSAPolicyId,
+ *     messageImprint               MessageImprint,
+ *       -- MUST have the same value as the similar field in
+ *       -- TimeStampReq
+ *     serialNumber                 INTEGER,
+ *      -- Time-Stamping users MUST be ready to accommodate integers
+ *      -- up to 160 bits.
+ *     genTime                      GeneralizedTime,
+ *     accuracy                     Accuracy                 OPTIONAL,
+ *     ordering                     BOOLEAN             DEFAULT FALSE,
+ *     nonce                        INTEGER                  OPTIONAL,
+ *       -- MUST be present if the similar field was present
+ *       -- in TimeStampReq.  In that case it MUST have the same value.
+ *     tsa                          [0] GeneralName          OPTIONAL,
+ *     extensions                   [1] IMPLICIT Extensions  OPTIONAL   }
+ */
+struct TS_tst_info_st {
+    ASN1_INTEGER *version;
+    ASN1_OBJECT *policy_id;
+    TS_MSG_IMPRINT *msg_imprint;
+    ASN1_INTEGER *serial;
+    ASN1_GENERALIZEDTIME *time;
+    TS_ACCURACY *accuracy;
+    ASN1_BOOLEAN ordering;
+    ASN1_INTEGER *nonce;
+    GENERAL_NAME *tsa;
+    STACK_OF(X509_EXTENSION) *extensions;
+};
+
+struct TS_status_info_st {
+    ASN1_INTEGER *status;
+    STACK_OF(ASN1_UTF8STRING) *text;
+    ASN1_BIT_STRING *failure_info;
+};
+
+/*-
+ * IssuerSerial ::= SEQUENCE {
+ *         issuer                   GeneralNames,
+ *         serialNumber             CertificateSerialNumber
+ *         }
+ */
+struct ESS_issuer_serial {
+    STACK_OF(GENERAL_NAME) *issuer;
+    ASN1_INTEGER *serial;
+};
+
+/*-
+ * ESSCertID ::=  SEQUENCE {
+ *         certHash                 Hash,
+ *         issuerSerial             IssuerSerial OPTIONAL
+ * }
+ */
+struct ESS_cert_id {
+    ASN1_OCTET_STRING *hash;    /* Always SHA-1 digest. */
+    ESS_ISSUER_SERIAL *issuer_serial;
+};
+
+/*-
+ * SigningCertificate ::=  SEQUENCE {
+ *        certs        SEQUENCE OF ESSCertID,
+ *        policies     SEQUENCE OF PolicyInformation OPTIONAL
+ * }
+ */
+struct ESS_signing_cert {
+    STACK_OF(ESS_CERT_ID) *cert_ids;
+    STACK_OF(POLICYINFO) *policy_info;
+};
+
+/*-
+ * ESSCertIDv2 ::=  SEQUENCE {
+ *        hashAlgorithm           AlgorithmIdentifier
+ *                DEFAULT {algorithm id-sha256},
+ *        certHash                Hash,
+ *        issuerSerial            IssuerSerial OPTIONAL
+ * }
+ */
+
+struct ESS_cert_id_v2_st {
+    X509_ALGOR *hash_alg;       /* Default: SHA-256 */
+    ASN1_OCTET_STRING *hash;
+    ESS_ISSUER_SERIAL *issuer_serial;
+};
+
+/*-
+ * SigningCertificateV2 ::= SEQUENCE {
+ *        certs                   SEQUENCE OF ESSCertIDv2,
+ *        policies                SEQUENCE OF PolicyInformation OPTIONAL
+ * }
+ */
+
+struct ESS_signing_cert_v2_st {
+    STACK_OF(ESS_CERT_ID_V2) *cert_ids;
+    STACK_OF(POLICYINFO) *policy_info;
+};
+
+
+struct TS_resp_ctx {
+    X509 *signer_cert;
+    EVP_PKEY *signer_key;
+    const EVP_MD *signer_md;
+    const EVP_MD *ess_cert_id_digest;
+    STACK_OF(X509) *certs;      /* Certs to include in signed data. */
+    STACK_OF(ASN1_OBJECT) *policies; /* Acceptable policies. */
+    ASN1_OBJECT *default_policy; /* It may appear in policies, too. */
+    STACK_OF(EVP_MD) *mds;      /* Acceptable message digests. */
+    ASN1_INTEGER *seconds;      /* accuracy, 0 means not specified. */
+    ASN1_INTEGER *millis;       /* accuracy, 0 means not specified. */
+    ASN1_INTEGER *micros;       /* accuracy, 0 means not specified. */
+    unsigned clock_precision_digits; /* fraction of seconds in time stamp
+                                      * token. */
+    unsigned flags;             /* Optional info, see values above. */
+    /* Callback functions. */
+    TS_serial_cb serial_cb;
+    void *serial_cb_data;       /* User data for serial_cb. */
+    TS_time_cb time_cb;
+    void *time_cb_data;         /* User data for time_cb. */
+    TS_extension_cb extension_cb;
+    void *extension_cb_data;    /* User data for extension_cb. */
+    /* These members are used only while creating the response. */
+    TS_REQ *request;
+    TS_RESP *response;
+    TS_TST_INFO *tst_info;
+};
+
+struct TS_verify_ctx {
+    /* Set this to the union of TS_VFY_... flags you want to carry out. */
+    unsigned flags;
+    /* Must be set only with TS_VFY_SIGNATURE. certs is optional. */
+    X509_STORE *store;
+    STACK_OF(X509) *certs;
+    /* Must be set only with TS_VFY_POLICY. */
+    ASN1_OBJECT *policy;
+    /*
+     * Must be set only with TS_VFY_IMPRINT. If md_alg is NULL, the
+     * algorithm from the response is used.
+     */
+    X509_ALGOR *md_alg;
+    unsigned char *imprint;
+    unsigned imprint_len;
+    /* Must be set only with TS_VFY_DATA. */
+    BIO *data;
+    /* Must be set only with TS_VFY_TSA_NAME. */
+    ASN1_INTEGER *nonce;
+    /* Must be set only with TS_VFY_TSA_NAME. */
+    GENERAL_NAME *tsa_name;
+};
diff --git a/contrib/libs/openssl/crypto/ts/ts_req_print.c b/contrib/libs/openssl/crypto/ts/ts_req_print.c
index 084e7324d4..4eba5cf018 100644
--- a/contrib/libs/openssl/crypto/ts/ts_req_print.c
+++ b/contrib/libs/openssl/crypto/ts/ts_req_print.c
@@ -13,7 +13,7 @@
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 int TS_REQ_print_bio(BIO *bio, TS_REQ *a)
 {
diff --git a/contrib/libs/openssl/crypto/ts/ts_req_utils.c b/contrib/libs/openssl/crypto/ts/ts_req_utils.c
index 2f6019fa03..a4568e3b77 100644
--- a/contrib/libs/openssl/crypto/ts/ts_req_utils.c
+++ b/contrib/libs/openssl/crypto/ts/ts_req_utils.c
@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 int TS_REQ_set_version(TS_REQ *a, long version)
 {
diff --git a/contrib/libs/openssl/crypto/ts/ts_rsp_print.c b/contrib/libs/openssl/crypto/ts/ts_rsp_print.c
index 82e5402ecf..a2451aaa8d 100644
--- a/contrib/libs/openssl/crypto/ts/ts_rsp_print.c
+++ b/contrib/libs/openssl/crypto/ts/ts_rsp_print.c
@@ -13,7 +13,7 @@
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 struct status_map_st {
     int bit;
diff --git a/contrib/libs/openssl/crypto/ts/ts_rsp_sign.c b/contrib/libs/openssl/crypto/ts/ts_rsp_sign.c
index 9d1ab8b8f2..342582f024 100644
--- a/contrib/libs/openssl/crypto/ts/ts_rsp_sign.c
+++ b/contrib/libs/openssl/crypto/ts/ts_rsp_sign.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
@@ -14,7 +14,7 @@
 #include <openssl/ts.h>
 #include <openssl/pkcs7.h>
 #include <openssl/crypto.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *);
 static int def_time_cb(struct TS_resp_ctx *, void *, long *sec, long *usec);
@@ -773,8 +773,8 @@ static ESS_CERT_ID *ess_CERT_ID_new_init(X509 *cert, int issuer_needed)
     X509_check_purpose(cert, -1, 0);
     if ((cid = ESS_CERT_ID_new()) == NULL)
         goto err;
-    if (!X509_digest(cert, EVP_sha1(), cert_sha1, NULL)) 
-        goto err; 
+    if (!X509_digest(cert, EVP_sha1(), cert_sha1, NULL))
+        goto err;
     if (!ASN1_OCTET_STRING_set(cid->hash, cert_sha1, SHA_DIGEST_LENGTH))
         goto err;
 
diff --git a/contrib/libs/openssl/crypto/ts/ts_rsp_utils.c b/contrib/libs/openssl/crypto/ts/ts_rsp_utils.c
index 45b89ee967..3fa0dbd0f0 100644
--- a/contrib/libs/openssl/crypto/ts/ts_rsp_utils.c
+++ b/contrib/libs/openssl/crypto/ts/ts_rsp_utils.c
@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/ts.h>
 #include <openssl/pkcs7.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info)
 {
diff --git a/contrib/libs/openssl/crypto/ts/ts_rsp_verify.c b/contrib/libs/openssl/crypto/ts/ts_rsp_verify.c
index 5ffc28749b..7fe3d27e74 100644
--- a/contrib/libs/openssl/crypto/ts/ts_rsp_verify.c
+++ b/contrib/libs/openssl/crypto/ts/ts_rsp_verify.c
@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/ts.h>
 #include <openssl/pkcs7.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
                           X509 *signer, STACK_OF(X509) **chain);
@@ -292,9 +292,9 @@ static int ts_find_cert(STACK_OF(ESS_CERT_ID) *cert_ids, X509 *cert)
     /* Recompute SHA1 hash of certificate if necessary (side effect). */
     X509_check_purpose(cert, -1, 0);
 
-    if (!X509_digest(cert, EVP_sha1(), cert_sha1, NULL)) 
-        return -1; 
- 
+    if (!X509_digest(cert, EVP_sha1(), cert_sha1, NULL))
+        return -1;
+
     /* Look for cert in the cert_ids vector. */
     for (i = 0; i < sk_ESS_CERT_ID_num(cert_ids); ++i) {
         ESS_CERT_ID *cid = sk_ESS_CERT_ID_value(cert_ids, i);
@@ -327,8 +327,8 @@ static int ts_find_cert_v2(STACK_OF(ESS_CERT_ID_V2) *cert_ids, X509 *cert)
         else
             md = EVP_sha256();
 
-        if (!X509_digest(cert, md, cert_digest, &len)) 
-            return -1; 
+        if (!X509_digest(cert, md, cert_digest, &len))
+            return -1;
         if (cid->hash->length != (int)len)
             return -1;
 
diff --git a/contrib/libs/openssl/crypto/ts/ts_verify_ctx.c b/contrib/libs/openssl/crypto/ts/ts_verify_ctx.c
index b3bd6abab6..32cd2f542b 100644
--- a/contrib/libs/openssl/crypto/ts/ts_verify_ctx.c
+++ b/contrib/libs/openssl/crypto/ts/ts_verify_ctx.c
@@ -10,7 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/ts.h>
-#include "ts_local.h" 
+#include "ts_local.h"
 
 TS_VERIFY_CTX *TS_VERIFY_CTX_new(void)
 {