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

10 files changed, 55 insertions, 55 deletions

diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_add.c b/contrib/libs/openssl/crypto/pkcs12/p12_add.c
index af184c86af..2586e45c0e 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_add.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_add.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_local.h"
+#include "p12_local.h" 
 
 /* Pack an object into an OCTET STRING and turn into a safebag */
 
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_asn.c b/contrib/libs/openssl/crypto/pkcs12/p12_asn.c
index 88f145890c..b3c42d03c9 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_asn.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_asn.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/pkcs12.h>
-#include "p12_local.h"
+#include "p12_local.h" 
 
 /* PKCS#12 ASN1 module */
 
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_attr.c b/contrib/libs/openssl/crypto/pkcs12/p12_attr.c
index a958fdf346..7551f7f742 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_attr.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_attr.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_local.h"
+#include "p12_local.h" 
 
 /* Add a local keyid to a safebag */
 
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_crt.c b/contrib/libs/openssl/crypto/pkcs12/p12_crt.c
index bfcae3f697..883f140424 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_crt.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_crt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-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
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_local.h"
+#include "p12_local.h" 
 
 static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
                           PKCS12_SAFEBAG *bag);
@@ -62,8 +62,8 @@ PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey, X509 *
     if (pkey && cert) {
         if (!X509_check_private_key(cert, pkey))
             return NULL;
-        if (!X509_digest(cert, EVP_sha1(), keyid, &keyidlen))
-            return NULL;
+        if (!X509_digest(cert, EVP_sha1(), keyid, &keyidlen)) 
+            return NULL; 
     }
 
     if (cert) {
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_init.c b/contrib/libs/openssl/crypto/pkcs12/p12_init.c
index 7ecc29ec0c..9d0a76ac66 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_init.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_init.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_local.h"
+#include "p12_local.h" 
 
 /* Initialise a PKCS12 structure to take data */
 
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_local.h b/contrib/libs/openssl/crypto/pkcs12/p12_local.h
index 0b52f1e1fe..19240d70eb 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_local.h
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_local.h
@@ -1,43 +1,43 @@
-/*
- * Copyright 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
- */
-
-struct PKCS12_MAC_DATA_st {
-    X509_SIG *dinfo;
-    ASN1_OCTET_STRING *salt;
-    ASN1_INTEGER *iter;         /* defaults to 1 */
-};
-
-struct PKCS12_st {
-    ASN1_INTEGER *version;
-    PKCS12_MAC_DATA *mac;
-    PKCS7 *authsafes;
-};
-
-struct PKCS12_SAFEBAG_st {
-    ASN1_OBJECT *type;
-    union {
-        struct pkcs12_bag_st *bag; /* secret, crl and certbag */
-        struct pkcs8_priv_key_info_st *keybag; /* keybag */
-        X509_SIG *shkeybag;     /* shrouded key bag */
-        STACK_OF(PKCS12_SAFEBAG) *safes;
-        ASN1_TYPE *other;
-    } value;
-    STACK_OF(X509_ATTRIBUTE) *attrib;
-};
-
-struct pkcs12_bag_st {
-    ASN1_OBJECT *type;
-    union {
-        ASN1_OCTET_STRING *x509cert;
-        ASN1_OCTET_STRING *x509crl;
-        ASN1_OCTET_STRING *octet;
-        ASN1_IA5STRING *sdsicert;
-        ASN1_TYPE *other;       /* Secret or other bag */
-    } value;
-};
+/* 
+ * Copyright 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 
+ */ 
+ 
+struct PKCS12_MAC_DATA_st { 
+    X509_SIG *dinfo; 
+    ASN1_OCTET_STRING *salt; 
+    ASN1_INTEGER *iter;         /* defaults to 1 */ 
+}; 
+ 
+struct PKCS12_st { 
+    ASN1_INTEGER *version; 
+    PKCS12_MAC_DATA *mac; 
+    PKCS7 *authsafes; 
+}; 
+ 
+struct PKCS12_SAFEBAG_st { 
+    ASN1_OBJECT *type; 
+    union { 
+        struct pkcs12_bag_st *bag; /* secret, crl and certbag */ 
+        struct pkcs8_priv_key_info_st *keybag; /* keybag */ 
+        X509_SIG *shkeybag;     /* shrouded key bag */ 
+        STACK_OF(PKCS12_SAFEBAG) *safes; 
+        ASN1_TYPE *other; 
+    } value; 
+    STACK_OF(X509_ATTRIBUTE) *attrib; 
+}; 
+ 
+struct pkcs12_bag_st { 
+    ASN1_OBJECT *type; 
+    union { 
+        ASN1_OCTET_STRING *x509cert; 
+        ASN1_OCTET_STRING *x509crl; 
+        ASN1_OCTET_STRING *octet; 
+        ASN1_IA5STRING *sdsicert; 
+        ASN1_TYPE *other;       /* Secret or other bag */ 
+    } value; 
+}; 
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_mutl.c b/contrib/libs/openssl/crypto/pkcs12/p12_mutl.c
index 3658003fe5..268f8db218 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_mutl.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_mutl.c
@@ -13,7 +13,7 @@
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
 #include <openssl/pkcs12.h>
-#include "p12_local.h"
+#include "p12_local.h" 
 
 int PKCS12_mac_present(const PKCS12 *p12)
 {
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_npas.c b/contrib/libs/openssl/crypto/pkcs12/p12_npas.c
index 0334289a89..3af6ad3e7f 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_npas.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_npas.c
@@ -13,7 +13,7 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/pkcs12.h>
-#include "p12_local.h"
+#include "p12_local.h" 
 
 /* PKCS#12 password change routine */
 
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_p8e.c b/contrib/libs/openssl/crypto/pkcs12/p12_p8e.c
index 05fc388a99..4919a595d9 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_p8e.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_p8e.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "crypto/x509.h"
+#include "crypto/x509.h" 
 
 X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
                         const char *pass, int passlen,
diff --git a/contrib/libs/openssl/crypto/pkcs12/p12_sbag.c b/contrib/libs/openssl/crypto/pkcs12/p12_sbag.c
index 7cf522786b..1b7b53aef1 100644
--- a/contrib/libs/openssl/crypto/pkcs12/p12_sbag.c
+++ b/contrib/libs/openssl/crypto/pkcs12/p12_sbag.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "p12_local.h"
+#include "p12_local.h" 
 
 #if OPENSSL_API_COMPAT < 0x10100000L
 ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, int attr_nid)