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

10 files changed, 245 insertions, 245 deletions

diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_asn.c b/contrib/libs/openssl/crypto/ocsp/ocsp_asn.c
index a869e32bc8..adc7b7ca8e 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_asn.c
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_asn.c
@@ -10,7 +10,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/ocsp.h>
-#include "ocsp_local.h"
+#include "ocsp_local.h" 
 
 ASN1_SEQUENCE(OCSP_SIGNATURE) = {
         ASN1_EMBED(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_cl.c b/contrib/libs/openssl/crypto/ocsp/ocsp_cl.c
index 55ffd45c6e..e23c2bc4d3 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_cl.c
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_cl.c
@@ -16,7 +16,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
-#include "ocsp_local.h"
+#include "ocsp_local.h" 
 
 /*
  * Utility functions related to sending OCSP requests and extracting relevant
diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_ext.c b/contrib/libs/openssl/crypto/ocsp/ocsp_ext.c
index f6c387ffb7..14e0219427 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_ext.c
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_ext.c
@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/ocsp.h>
-#include "ocsp_local.h"
+#include "ocsp_local.h" 
 #include <openssl/rand.h>
 #include <openssl/x509v3.h>
 
diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_ht.c b/contrib/libs/openssl/crypto/ocsp/ocsp_ht.c
index ba408bc86f..0a6de04b53 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_ht.c
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_ht.c
@@ -10,7 +10,7 @@
 #include "e_os.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "crypto/ctype.h"
+#include "crypto/ctype.h" 
 #include <string.h>
 #include <openssl/asn1.h>
 #include <openssl/ocsp.h>
diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_lib.c b/contrib/libs/openssl/crypto/ocsp/ocsp_lib.c
index 37ac6c03fd..aada03b421 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_lib.c
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_lib.c
@@ -14,7 +14,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
-#include "ocsp_local.h"
+#include "ocsp_local.h" 
 #include <openssl/asn1t.h>
 
 /* Convert a certificate and its issuer to an OCSP_CERTID */
diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_local.h b/contrib/libs/openssl/crypto/ocsp/ocsp_local.h
index 36646fdfc9..ea185f7360 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_local.h
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_local.h
@@ -1,236 +1,236 @@
-/*
- * Copyright 2015-2018 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
- */
-
-/*-  CertID ::= SEQUENCE {
- *       hashAlgorithm            AlgorithmIdentifier,
- *       issuerNameHash     OCTET STRING, -- Hash of Issuer's DN
- *       issuerKeyHash      OCTET STRING, -- Hash of Issuers public key (excluding the tag & length fields)
- *       serialNumber       CertificateSerialNumber }
- */
-struct ocsp_cert_id_st {
-    X509_ALGOR hashAlgorithm;
-    ASN1_OCTET_STRING issuerNameHash;
-    ASN1_OCTET_STRING issuerKeyHash;
-    ASN1_INTEGER serialNumber;
-};
-
-/*-  Request ::=     SEQUENCE {
- *       reqCert                    CertID,
- *       singleRequestExtensions    [0] EXPLICIT Extensions OPTIONAL }
- */
-struct ocsp_one_request_st {
-    OCSP_CERTID *reqCert;
-    STACK_OF(X509_EXTENSION) *singleRequestExtensions;
-};
-
-/*-  TBSRequest      ::=     SEQUENCE {
- *       version             [0] EXPLICIT Version DEFAULT v1,
- *       requestorName       [1] EXPLICIT GeneralName OPTIONAL,
- *       requestList             SEQUENCE OF Request,
- *       requestExtensions   [2] EXPLICIT Extensions OPTIONAL }
- */
-struct ocsp_req_info_st {
-    ASN1_INTEGER *version;
-    GENERAL_NAME *requestorName;
-    STACK_OF(OCSP_ONEREQ) *requestList;
-    STACK_OF(X509_EXTENSION) *requestExtensions;
-};
-
-/*-  Signature       ::=     SEQUENCE {
- *       signatureAlgorithm   AlgorithmIdentifier,
- *       signature            BIT STRING,
- *       certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-struct ocsp_signature_st {
-    X509_ALGOR signatureAlgorithm;
-    ASN1_BIT_STRING *signature;
-    STACK_OF(X509) *certs;
-};
-
-/*-  OCSPRequest     ::=     SEQUENCE {
- *       tbsRequest                  TBSRequest,
- *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL }
- */
-struct ocsp_request_st {
-    OCSP_REQINFO tbsRequest;
-    OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */
-};
-
-/*-  OCSPResponseStatus ::= ENUMERATED {
- *       successful            (0),      --Response has valid confirmations
- *       malformedRequest      (1),      --Illegal confirmation request
- *       internalError         (2),      --Internal error in issuer
- *       tryLater              (3),      --Try again later
- *                                       --(4) is not used
- *       sigRequired           (5),      --Must sign the request
- *       unauthorized          (6)       --Request unauthorized
- *   }
- */
-
-/*-  ResponseBytes ::=       SEQUENCE {
- *       responseType   OBJECT IDENTIFIER,
- *       response       OCTET STRING }
- */
-struct ocsp_resp_bytes_st {
-    ASN1_OBJECT *responseType;
-    ASN1_OCTET_STRING *response;
-};
-
-/*-  OCSPResponse ::= SEQUENCE {
- *      responseStatus         OCSPResponseStatus,
- *      responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL }
- */
-struct ocsp_response_st {
-    ASN1_ENUMERATED *responseStatus;
-    OCSP_RESPBYTES *responseBytes;
-};
-
-/*-  ResponderID ::= CHOICE {
- *      byName   [1] Name,
- *      byKey    [2] KeyHash }
- */
-struct ocsp_responder_id_st {
-    int type;
-    union {
-        X509_NAME *byName;
-        ASN1_OCTET_STRING *byKey;
-    } value;
-};
-
-/*-  KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key
- *                            --(excluding the tag and length fields)
- */
-
-/*-  RevokedInfo ::= SEQUENCE {
- *       revocationTime              GeneralizedTime,
- *       revocationReason    [0]     EXPLICIT CRLReason OPTIONAL }
- */
-struct ocsp_revoked_info_st {
-    ASN1_GENERALIZEDTIME *revocationTime;
-    ASN1_ENUMERATED *revocationReason;
-};
-
-/*-  CertStatus ::= CHOICE {
- *       good                [0]     IMPLICIT NULL,
- *       revoked             [1]     IMPLICIT RevokedInfo,
- *       unknown             [2]     IMPLICIT UnknownInfo }
- */
-struct ocsp_cert_status_st {
-    int type;
-    union {
-        ASN1_NULL *good;
-        OCSP_REVOKEDINFO *revoked;
-        ASN1_NULL *unknown;
-    } value;
-};
-
-/*-  SingleResponse ::= SEQUENCE {
- *      certID                       CertID,
- *      certStatus                   CertStatus,
- *      thisUpdate                   GeneralizedTime,
- *      nextUpdate           [0]     EXPLICIT GeneralizedTime OPTIONAL,
- *      singleExtensions     [1]     EXPLICIT Extensions OPTIONAL }
- */
-struct ocsp_single_response_st {
-    OCSP_CERTID *certId;
-    OCSP_CERTSTATUS *certStatus;
-    ASN1_GENERALIZEDTIME *thisUpdate;
-    ASN1_GENERALIZEDTIME *nextUpdate;
-    STACK_OF(X509_EXTENSION) *singleExtensions;
-};
-
-/*-  ResponseData ::= SEQUENCE {
- *      version              [0] EXPLICIT Version DEFAULT v1,
- *      responderID              ResponderID,
- *      producedAt               GeneralizedTime,
- *      responses                SEQUENCE OF SingleResponse,
- *      responseExtensions   [1] EXPLICIT Extensions OPTIONAL }
- */
-struct ocsp_response_data_st {
-    ASN1_INTEGER *version;
-    OCSP_RESPID responderId;
-    ASN1_GENERALIZEDTIME *producedAt;
-    STACK_OF(OCSP_SINGLERESP) *responses;
-    STACK_OF(X509_EXTENSION) *responseExtensions;
-};
-
-/*-  BasicOCSPResponse       ::= SEQUENCE {
- *      tbsResponseData      ResponseData,
- *      signatureAlgorithm   AlgorithmIdentifier,
- *      signature            BIT STRING,
- *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-  /*
-   * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
-   * follows: "The value for the signature SHALL be computed on the hash of
-   * the DER encoding ResponseData." This means that you must hash the
-   * DER-encoded tbsResponseData, and then run it through a crypto-signing
-   * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
-   * operation.  This seems a bit odd, but that's the spec.  Also note that
-   * the data structures do not leave anywhere to independently specify the
-   * algorithm used for the initial hash. So, we look at the
-   * signature-specification algorithm, and try to do something intelligent.
-   * -- Kathy Weinhold, CertCo
-   */
-  /*
-   * Note 2: It seems that the mentioned passage from RFC 2560 (section
-   * 4.2.1) is open for interpretation.  I've done tests against another
-   * responder, and found that it doesn't do the double hashing that the RFC
-   * seems to say one should.  Therefore, all relevant functions take a flag
-   * saying which variant should be used.  -- Richard Levitte, OpenSSL team
-   * and CeloCom
-   */
-struct ocsp_basic_response_st {
-    OCSP_RESPDATA tbsResponseData;
-    X509_ALGOR signatureAlgorithm;
-    ASN1_BIT_STRING *signature;
-    STACK_OF(X509) *certs;
-};
-
-/*-
- * CrlID ::= SEQUENCE {
- *     crlUrl               [0]     EXPLICIT IA5String OPTIONAL,
- *     crlNum               [1]     EXPLICIT INTEGER OPTIONAL,
- *     crlTime              [2]     EXPLICIT GeneralizedTime OPTIONAL }
- */
-struct ocsp_crl_id_st {
-    ASN1_IA5STRING *crlUrl;
-    ASN1_INTEGER *crlNum;
-    ASN1_GENERALIZEDTIME *crlTime;
-};
-
-/*-
- * ServiceLocator ::= SEQUENCE {
- *      issuer    Name,
- *      locator   AuthorityInfoAccessSyntax OPTIONAL }
- */
-struct ocsp_service_locator_st {
-    X509_NAME *issuer;
-    STACK_OF(ACCESS_DESCRIPTION) *locator;
-};
-
-#  define OCSP_REQUEST_sign(o,pkey,md) \
-        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
-                &(o)->optionalSignature->signatureAlgorithm,NULL,\
-                (o)->optionalSignature->signature,&(o)->tbsRequest,pkey,md)
-
-#  define OCSP_BASICRESP_sign(o,pkey,md,d) \
-        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),&(o)->signatureAlgorithm,\
-                NULL,(o)->signature,&(o)->tbsResponseData,pkey,md)
-
-#  define OCSP_BASICRESP_sign_ctx(o,ctx,d) \
-        ASN1_item_sign_ctx(ASN1_ITEM_rptr(OCSP_RESPDATA),&(o)->signatureAlgorithm,\
-                NULL,(o)->signature,&(o)->tbsResponseData,ctx)
-
-#  define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\
-        &(a)->optionalSignature->signatureAlgorithm,\
-        (a)->optionalSignature->signature,&(a)->tbsRequest,r)
-
-#  define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\
-        &(a)->signatureAlgorithm,(a)->signature,&(a)->tbsResponseData,r)
+/* 
+ * Copyright 2015-2018 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 
+ */ 
+ 
+/*-  CertID ::= SEQUENCE { 
+ *       hashAlgorithm            AlgorithmIdentifier, 
+ *       issuerNameHash     OCTET STRING, -- Hash of Issuer's DN 
+ *       issuerKeyHash      OCTET STRING, -- Hash of Issuers public key (excluding the tag & length fields) 
+ *       serialNumber       CertificateSerialNumber } 
+ */ 
+struct ocsp_cert_id_st { 
+    X509_ALGOR hashAlgorithm; 
+    ASN1_OCTET_STRING issuerNameHash; 
+    ASN1_OCTET_STRING issuerKeyHash; 
+    ASN1_INTEGER serialNumber; 
+}; 
+ 
+/*-  Request ::=     SEQUENCE { 
+ *       reqCert                    CertID, 
+ *       singleRequestExtensions    [0] EXPLICIT Extensions OPTIONAL } 
+ */ 
+struct ocsp_one_request_st { 
+    OCSP_CERTID *reqCert; 
+    STACK_OF(X509_EXTENSION) *singleRequestExtensions; 
+}; 
+ 
+/*-  TBSRequest      ::=     SEQUENCE { 
+ *       version             [0] EXPLICIT Version DEFAULT v1, 
+ *       requestorName       [1] EXPLICIT GeneralName OPTIONAL, 
+ *       requestList             SEQUENCE OF Request, 
+ *       requestExtensions   [2] EXPLICIT Extensions OPTIONAL } 
+ */ 
+struct ocsp_req_info_st { 
+    ASN1_INTEGER *version; 
+    GENERAL_NAME *requestorName; 
+    STACK_OF(OCSP_ONEREQ) *requestList; 
+    STACK_OF(X509_EXTENSION) *requestExtensions; 
+}; 
+ 
+/*-  Signature       ::=     SEQUENCE { 
+ *       signatureAlgorithm   AlgorithmIdentifier, 
+ *       signature            BIT STRING, 
+ *       certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } 
+ */ 
+struct ocsp_signature_st { 
+    X509_ALGOR signatureAlgorithm; 
+    ASN1_BIT_STRING *signature; 
+    STACK_OF(X509) *certs; 
+}; 
+ 
+/*-  OCSPRequest     ::=     SEQUENCE { 
+ *       tbsRequest                  TBSRequest, 
+ *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL } 
+ */ 
+struct ocsp_request_st { 
+    OCSP_REQINFO tbsRequest; 
+    OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */ 
+}; 
+ 
+/*-  OCSPResponseStatus ::= ENUMERATED { 
+ *       successful            (0),      --Response has valid confirmations 
+ *       malformedRequest      (1),      --Illegal confirmation request 
+ *       internalError         (2),      --Internal error in issuer 
+ *       tryLater              (3),      --Try again later 
+ *                                       --(4) is not used 
+ *       sigRequired           (5),      --Must sign the request 
+ *       unauthorized          (6)       --Request unauthorized 
+ *   } 
+ */ 
+ 
+/*-  ResponseBytes ::=       SEQUENCE { 
+ *       responseType   OBJECT IDENTIFIER, 
+ *       response       OCTET STRING } 
+ */ 
+struct ocsp_resp_bytes_st { 
+    ASN1_OBJECT *responseType; 
+    ASN1_OCTET_STRING *response; 
+}; 
+ 
+/*-  OCSPResponse ::= SEQUENCE { 
+ *      responseStatus         OCSPResponseStatus, 
+ *      responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL } 
+ */ 
+struct ocsp_response_st { 
+    ASN1_ENUMERATED *responseStatus; 
+    OCSP_RESPBYTES *responseBytes; 
+}; 
+ 
+/*-  ResponderID ::= CHOICE { 
+ *      byName   [1] Name, 
+ *      byKey    [2] KeyHash } 
+ */ 
+struct ocsp_responder_id_st { 
+    int type; 
+    union { 
+        X509_NAME *byName; 
+        ASN1_OCTET_STRING *byKey; 
+    } value; 
+}; 
+ 
+/*-  KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key 
+ *                            --(excluding the tag and length fields) 
+ */ 
+ 
+/*-  RevokedInfo ::= SEQUENCE { 
+ *       revocationTime              GeneralizedTime, 
+ *       revocationReason    [0]     EXPLICIT CRLReason OPTIONAL } 
+ */ 
+struct ocsp_revoked_info_st { 
+    ASN1_GENERALIZEDTIME *revocationTime; 
+    ASN1_ENUMERATED *revocationReason; 
+}; 
+ 
+/*-  CertStatus ::= CHOICE { 
+ *       good                [0]     IMPLICIT NULL, 
+ *       revoked             [1]     IMPLICIT RevokedInfo, 
+ *       unknown             [2]     IMPLICIT UnknownInfo } 
+ */ 
+struct ocsp_cert_status_st { 
+    int type; 
+    union { 
+        ASN1_NULL *good; 
+        OCSP_REVOKEDINFO *revoked; 
+        ASN1_NULL *unknown; 
+    } value; 
+}; 
+ 
+/*-  SingleResponse ::= SEQUENCE { 
+ *      certID                       CertID, 
+ *      certStatus                   CertStatus, 
+ *      thisUpdate                   GeneralizedTime, 
+ *      nextUpdate           [0]     EXPLICIT GeneralizedTime OPTIONAL, 
+ *      singleExtensions     [1]     EXPLICIT Extensions OPTIONAL } 
+ */ 
+struct ocsp_single_response_st { 
+    OCSP_CERTID *certId; 
+    OCSP_CERTSTATUS *certStatus; 
+    ASN1_GENERALIZEDTIME *thisUpdate; 
+    ASN1_GENERALIZEDTIME *nextUpdate; 
+    STACK_OF(X509_EXTENSION) *singleExtensions; 
+}; 
+ 
+/*-  ResponseData ::= SEQUENCE { 
+ *      version              [0] EXPLICIT Version DEFAULT v1, 
+ *      responderID              ResponderID, 
+ *      producedAt               GeneralizedTime, 
+ *      responses                SEQUENCE OF SingleResponse, 
+ *      responseExtensions   [1] EXPLICIT Extensions OPTIONAL } 
+ */ 
+struct ocsp_response_data_st { 
+    ASN1_INTEGER *version; 
+    OCSP_RESPID responderId; 
+    ASN1_GENERALIZEDTIME *producedAt; 
+    STACK_OF(OCSP_SINGLERESP) *responses; 
+    STACK_OF(X509_EXTENSION) *responseExtensions; 
+}; 
+ 
+/*-  BasicOCSPResponse       ::= SEQUENCE { 
+ *      tbsResponseData      ResponseData, 
+ *      signatureAlgorithm   AlgorithmIdentifier, 
+ *      signature            BIT STRING, 
+ *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } 
+ */ 
+  /* 
+   * Note 1: The value for "signature" is specified in the OCSP rfc2560 as 
+   * follows: "The value for the signature SHALL be computed on the hash of 
+   * the DER encoding ResponseData." This means that you must hash the 
+   * DER-encoded tbsResponseData, and then run it through a crypto-signing 
+   * function, which will (at least w/RSA) do a hash-'n'-private-encrypt 
+   * operation.  This seems a bit odd, but that's the spec.  Also note that 
+   * the data structures do not leave anywhere to independently specify the 
+   * algorithm used for the initial hash. So, we look at the 
+   * signature-specification algorithm, and try to do something intelligent. 
+   * -- Kathy Weinhold, CertCo 
+   */ 
+  /* 
+   * Note 2: It seems that the mentioned passage from RFC 2560 (section 
+   * 4.2.1) is open for interpretation.  I've done tests against another 
+   * responder, and found that it doesn't do the double hashing that the RFC 
+   * seems to say one should.  Therefore, all relevant functions take a flag 
+   * saying which variant should be used.  -- Richard Levitte, OpenSSL team 
+   * and CeloCom 
+   */ 
+struct ocsp_basic_response_st { 
+    OCSP_RESPDATA tbsResponseData; 
+    X509_ALGOR signatureAlgorithm; 
+    ASN1_BIT_STRING *signature; 
+    STACK_OF(X509) *certs; 
+}; 
+ 
+/*- 
+ * CrlID ::= SEQUENCE { 
+ *     crlUrl               [0]     EXPLICIT IA5String OPTIONAL, 
+ *     crlNum               [1]     EXPLICIT INTEGER OPTIONAL, 
+ *     crlTime              [2]     EXPLICIT GeneralizedTime OPTIONAL } 
+ */ 
+struct ocsp_crl_id_st { 
+    ASN1_IA5STRING *crlUrl; 
+    ASN1_INTEGER *crlNum; 
+    ASN1_GENERALIZEDTIME *crlTime; 
+}; 
+ 
+/*- 
+ * ServiceLocator ::= SEQUENCE { 
+ *      issuer    Name, 
+ *      locator   AuthorityInfoAccessSyntax OPTIONAL } 
+ */ 
+struct ocsp_service_locator_st { 
+    X509_NAME *issuer; 
+    STACK_OF(ACCESS_DESCRIPTION) *locator; 
+}; 
+ 
+#  define OCSP_REQUEST_sign(o,pkey,md) \ 
+        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\ 
+                &(o)->optionalSignature->signatureAlgorithm,NULL,\ 
+                (o)->optionalSignature->signature,&(o)->tbsRequest,pkey,md) 
+ 
+#  define OCSP_BASICRESP_sign(o,pkey,md,d) \ 
+        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),&(o)->signatureAlgorithm,\ 
+                NULL,(o)->signature,&(o)->tbsResponseData,pkey,md) 
+ 
+#  define OCSP_BASICRESP_sign_ctx(o,ctx,d) \ 
+        ASN1_item_sign_ctx(ASN1_ITEM_rptr(OCSP_RESPDATA),&(o)->signatureAlgorithm,\ 
+                NULL,(o)->signature,&(o)->tbsResponseData,ctx) 
+ 
+#  define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\ 
+        &(a)->optionalSignature->signatureAlgorithm,\ 
+        (a)->optionalSignature->signature,&(a)->tbsRequest,r) 
+ 
+#  define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\ 
+        &(a)->signatureAlgorithm,(a)->signature,&(a)->tbsResponseData,r) 
diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_prn.c b/contrib/libs/openssl/crypto/ocsp/ocsp_prn.c
index 1965f2a183..c4f952f2af 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_prn.c
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_prn.c
@@ -10,7 +10,7 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/ocsp.h>
-#include "ocsp_local.h"
+#include "ocsp_local.h" 
 #include "internal/cryptlib.h"
 #include <openssl/pem.h>
 
diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_srv.c b/contrib/libs/openssl/crypto/ocsp/ocsp_srv.c
index e35fc52fd9..a50b276154 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_srv.c
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_srv.c
@@ -14,7 +14,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/ocsp.h>
-#include "ocsp_local.h"
+#include "ocsp_local.h" 
 
 /*
  * Utility functions related to sending OCSP responses and extracting
diff --git a/contrib/libs/openssl/crypto/ocsp/ocsp_vfy.c b/contrib/libs/openssl/crypto/ocsp/ocsp_vfy.c
index e87b71c0c7..dacab13144 100644
--- a/contrib/libs/openssl/crypto/ocsp/ocsp_vfy.c
+++ b/contrib/libs/openssl/crypto/ocsp/ocsp_vfy.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/ocsp.h>
-#include "ocsp_local.h"
+#include "ocsp_local.h" 
 #include <openssl/err.h>
 #include <string.h>
 
diff --git a/contrib/libs/openssl/crypto/ocsp/v3_ocsp.c b/contrib/libs/openssl/crypto/ocsp/v3_ocsp.c
index a174ce15a6..18b18ce7ec 100644
--- a/contrib/libs/openssl/crypto/ocsp/v3_ocsp.c
+++ b/contrib/libs/openssl/crypto/ocsp/v3_ocsp.c
@@ -12,7 +12,7 @@
 # include <openssl/conf.h>
 # include <openssl/asn1.h>
 # include <openssl/ocsp.h>
-# include "ocsp_local.h"
+# include "ocsp_local.h" 
 # include <openssl/x509v3.h>
 # include "../x509v3/ext_dat.h"