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

1 files changed, 70 insertions, 70 deletions

diff --git a/contrib/libs/openssl/crypto/x509/x509_lu.c b/contrib/libs/openssl/crypto/x509/x509_lu.c
index 641a41c35c..411c451838 100644
--- a/contrib/libs/openssl/crypto/x509/x509_lu.c
+++ b/contrib/libs/openssl/crypto/x509/x509_lu.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
@@ -289,25 +289,25 @@ X509_OBJECT *X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *vs,
 int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type,
                                   X509_NAME *name, X509_OBJECT *ret)
 {
-    X509_STORE *store = vs->ctx;
+    X509_STORE *store = vs->ctx; 
     X509_LOOKUP *lu;
     X509_OBJECT stmp, *tmp;
     int i, j;
 
-    if (store == NULL)
+    if (store == NULL) 
         return 0;
 
     stmp.type = X509_LU_NONE;
-    stmp.data.ptr = NULL;
-
-
-    X509_STORE_lock(store);
-    tmp = X509_OBJECT_retrieve_by_subject(store->objs, type, name);
-    X509_STORE_unlock(store);
+    stmp.data.ptr = NULL; 
+ 
 
+    X509_STORE_lock(store); 
+    tmp = X509_OBJECT_retrieve_by_subject(store->objs, type, name); 
+    X509_STORE_unlock(store); 
+ 
     if (tmp == NULL || type == X509_LU_CRL) {
-        for (i = 0; i < sk_X509_LOOKUP_num(store->get_cert_methods); i++) {
-            lu = sk_X509_LOOKUP_value(store->get_cert_methods, i);
+        for (i = 0; i < sk_X509_LOOKUP_num(store->get_cert_methods); i++) { 
+            lu = sk_X509_LOOKUP_value(store->get_cert_methods, i); 
             j = X509_LOOKUP_by_subject(lu, type, name, &stmp);
             if (j) {
                 tmp = &stmp;
@@ -318,16 +318,16 @@ int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type,
             return 0;
     }
 
-    if (!X509_OBJECT_up_ref_count(tmp))
-        return 0;
-
+    if (!X509_OBJECT_up_ref_count(tmp)) 
+        return 0; 
+ 
     ret->type = tmp->type;
     ret->data.ptr = tmp->data.ptr;
 
     return 1;
 }
 
-static int x509_store_add(X509_STORE *store, void *x, int crl) {
+static int x509_store_add(X509_STORE *store, void *x, int crl) { 
     X509_OBJECT *obj;
     int ret = 0, added = 0;
 
@@ -344,20 +344,20 @@ static int x509_store_add(X509_STORE *store, void *x, int crl) {
         obj->type = X509_LU_X509;
         obj->data.x509 = (X509 *)x;
     }
-    if (!X509_OBJECT_up_ref_count(obj)) {
-        obj->type = X509_LU_NONE;
-        X509_OBJECT_free(obj);
-        return 0;
-    }
+    if (!X509_OBJECT_up_ref_count(obj)) { 
+        obj->type = X509_LU_NONE; 
+        X509_OBJECT_free(obj); 
+        return 0; 
+    } 
 
-    X509_STORE_lock(store);
-    if (X509_OBJECT_retrieve_match(store->objs, obj)) {
+    X509_STORE_lock(store); 
+    if (X509_OBJECT_retrieve_match(store->objs, obj)) { 
         ret = 1;
     } else {
-        added = sk_X509_OBJECT_push(store->objs, obj);
+        added = sk_X509_OBJECT_push(store->objs, obj); 
         ret = added != 0;
     }
-    X509_STORE_unlock(store);
+    X509_STORE_unlock(store); 
 
     if (added == 0)             /* obj not pushed */
         X509_OBJECT_free(obj);
@@ -538,13 +538,13 @@ STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx, X509_NAME *nm)
     STACK_OF(X509) *sk = NULL;
     X509 *x;
     X509_OBJECT *obj;
-    X509_STORE *store = ctx->ctx;
+    X509_STORE *store = ctx->ctx; 
 
-    if (store == NULL)
+    if (store == NULL) 
         return NULL;
 
-    X509_STORE_lock(store);
-    idx = x509_object_idx_cnt(store->objs, X509_LU_X509, nm, &cnt);
+    X509_STORE_lock(store); 
+    idx = x509_object_idx_cnt(store->objs, X509_LU_X509, nm, &cnt); 
     if (idx < 0) {
         /*
          * Nothing found in cache: do lookup to possibly add new objects to
@@ -552,8 +552,8 @@ STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx, X509_NAME *nm)
          */
         X509_OBJECT *xobj = X509_OBJECT_new();
 
-        X509_STORE_unlock(store);
-
+        X509_STORE_unlock(store); 
+ 
         if (xobj == NULL)
             return NULL;
         if (!X509_STORE_CTX_get_by_subject(ctx, X509_LU_X509, nm, xobj)) {
@@ -561,31 +561,31 @@ STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx, X509_NAME *nm)
             return NULL;
         }
         X509_OBJECT_free(xobj);
-        X509_STORE_lock(store);
-        idx = x509_object_idx_cnt(store->objs, X509_LU_X509, nm, &cnt);
+        X509_STORE_lock(store); 
+        idx = x509_object_idx_cnt(store->objs, X509_LU_X509, nm, &cnt); 
         if (idx < 0) {
-            X509_STORE_unlock(store);
+            X509_STORE_unlock(store); 
             return NULL;
         }
     }
 
     sk = sk_X509_new_null();
     for (i = 0; i < cnt; i++, idx++) {
-        obj = sk_X509_OBJECT_value(store->objs, idx);
+        obj = sk_X509_OBJECT_value(store->objs, idx); 
         x = obj->data.x509;
-        if (!X509_up_ref(x)) {
-            X509_STORE_unlock(store);
-            sk_X509_pop_free(sk, X509_free);
-            return NULL;
-        }
+        if (!X509_up_ref(x)) { 
+            X509_STORE_unlock(store); 
+            sk_X509_pop_free(sk, X509_free); 
+            return NULL; 
+        } 
         if (!sk_X509_push(sk, x)) {
-            X509_STORE_unlock(store);
+            X509_STORE_unlock(store); 
             X509_free(x);
             sk_X509_pop_free(sk, X509_free);
             return NULL;
         }
     }
-    X509_STORE_unlock(store);
+    X509_STORE_unlock(store); 
     return sk;
 }
 
@@ -595,42 +595,42 @@ STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(X509_STORE_CTX *ctx, X509_NAME *nm)
     STACK_OF(X509_CRL) *sk = sk_X509_CRL_new_null();
     X509_CRL *x;
     X509_OBJECT *obj, *xobj = X509_OBJECT_new();
-    X509_STORE *store = ctx->ctx;
+    X509_STORE *store = ctx->ctx; 
 
     /* Always do lookup to possibly add new CRLs to cache */
     if (sk == NULL
             || xobj == NULL
-            || store == NULL
+            || store == NULL 
             || !X509_STORE_CTX_get_by_subject(ctx, X509_LU_CRL, nm, xobj)) {
         X509_OBJECT_free(xobj);
         sk_X509_CRL_free(sk);
         return NULL;
     }
     X509_OBJECT_free(xobj);
-    X509_STORE_lock(store);
-    idx = x509_object_idx_cnt(store->objs, X509_LU_CRL, nm, &cnt);
+    X509_STORE_lock(store); 
+    idx = x509_object_idx_cnt(store->objs, X509_LU_CRL, nm, &cnt); 
     if (idx < 0) {
-        X509_STORE_unlock(store);
+        X509_STORE_unlock(store); 
         sk_X509_CRL_free(sk);
         return NULL;
     }
 
     for (i = 0; i < cnt; i++, idx++) {
-        obj = sk_X509_OBJECT_value(store->objs, idx);
+        obj = sk_X509_OBJECT_value(store->objs, idx); 
         x = obj->data.crl;
-        if (!X509_CRL_up_ref(x)) {
-            X509_STORE_unlock(store);
-            sk_X509_CRL_pop_free(sk, X509_CRL_free);
-            return NULL;
-        }
+        if (!X509_CRL_up_ref(x)) { 
+            X509_STORE_unlock(store); 
+            sk_X509_CRL_pop_free(sk, X509_CRL_free); 
+            return NULL; 
+        } 
         if (!sk_X509_CRL_push(sk, x)) {
-            X509_STORE_unlock(store);
+            X509_STORE_unlock(store); 
             X509_CRL_free(x);
             sk_X509_CRL_pop_free(sk, X509_CRL_free);
             return NULL;
         }
     }
-    X509_STORE_unlock(store);
+    X509_STORE_unlock(store); 
     return sk;
 }
 
@@ -678,7 +678,7 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
 {
     X509_NAME *xn;
     X509_OBJECT *obj = X509_OBJECT_new(), *pobj = NULL;
-    X509_STORE *store = ctx->ctx;
+    X509_STORE *store = ctx->ctx; 
     int i, ok, idx, ret;
 
     if (obj == NULL)
@@ -694,28 +694,28 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
     if (ctx->check_issued(ctx, x, obj->data.x509)) {
         if (x509_check_cert_time(ctx, obj->data.x509, -1)) {
             *issuer = obj->data.x509;
-            if (!X509_up_ref(*issuer)) {
-                *issuer = NULL;
-                ok = -1;
-            }
+            if (!X509_up_ref(*issuer)) { 
+                *issuer = NULL; 
+                ok = -1; 
+            } 
             X509_OBJECT_free(obj);
-            return ok;
+            return ok; 
         }
     }
     X509_OBJECT_free(obj);
 
-    if (store == NULL)
+    if (store == NULL) 
         return 0;
 
     /* Else find index of first cert accepted by 'check_issued' */
     ret = 0;
-    X509_STORE_lock(store);
-    idx = X509_OBJECT_idx_by_subject(store->objs, X509_LU_X509, xn);
+    X509_STORE_lock(store); 
+    idx = X509_OBJECT_idx_by_subject(store->objs, X509_LU_X509, xn); 
     if (idx != -1) {            /* should be true as we've had at least one
                                  * match */
         /* Look through all matching certs for suitable issuer */
-        for (i = idx; i < sk_X509_OBJECT_num(store->objs); i++) {
-            pobj = sk_X509_OBJECT_value(store->objs, i);
+        for (i = idx; i < sk_X509_OBJECT_num(store->objs); i++) { 
+            pobj = sk_X509_OBJECT_value(store->objs, i); 
             /* See if we've run past the matches */
             if (pobj->type != X509_LU_X509)
                 break;
@@ -736,11 +736,11 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
             }
         }
     }
-    if (*issuer && !X509_up_ref(*issuer)) {
-        *issuer = NULL;
-        ret = -1;
-    }
-    X509_STORE_unlock(store);
+    if (*issuer && !X509_up_ref(*issuer)) { 
+        *issuer = NULL; 
+        ret = -1; 
+    } 
+    X509_STORE_unlock(store); 
     return ret;
 }