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

1 files changed, 27 insertions, 27 deletions

diff --git a/contrib/libs/openssl/ssl/statem/statem_srvr.c b/contrib/libs/openssl/ssl/statem/statem_srvr.c
index d701c46b43..911d9f8d80 100644
--- a/contrib/libs/openssl/ssl/statem/statem_srvr.c
+++ b/contrib/libs/openssl/ssl/statem/statem_srvr.c
@@ -792,10 +792,10 @@ static ossl_inline int conn_is_closed(void)
     case ECONNRESET:
         return 1;
 #endif
-#if defined(WSAECONNRESET)
-    case WSAECONNRESET:
-        return 1;
-#endif
+#if defined(WSAECONNRESET) 
+    case WSAECONNRESET: 
+        return 1; 
+#endif 
     default:
         return 0;
     }
@@ -1946,14 +1946,14 @@ static int tls_early_post_process_client_hello(SSL *s)
                 && master_key_length > 0) {
             s->session->master_key_length = master_key_length;
             s->hit = 1;
-            s->peer_ciphers = ciphers;
+            s->peer_ciphers = ciphers; 
             s->session->verify_result = X509_V_OK;
 
             ciphers = NULL;
 
             /* check if some cipher was preferred by call back */
             if (pref_cipher == NULL)
-                pref_cipher = ssl3_choose_cipher(s, s->peer_ciphers,
+                pref_cipher = ssl3_choose_cipher(s, s->peer_ciphers, 
                                                  SSL_get_ciphers(s));
             if (pref_cipher == NULL) {
                 SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
@@ -1964,9 +1964,9 @@ static int tls_early_post_process_client_hello(SSL *s)
 
             s->session->cipher = pref_cipher;
             sk_SSL_CIPHER_free(s->cipher_list);
-            s->cipher_list = sk_SSL_CIPHER_dup(s->peer_ciphers);
+            s->cipher_list = sk_SSL_CIPHER_dup(s->peer_ciphers); 
             sk_SSL_CIPHER_free(s->cipher_list_by_id);
-            s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->peer_ciphers);
+            s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->peer_ciphers); 
         }
     }
 
@@ -2066,12 +2066,12 @@ static int tls_early_post_process_client_hello(SSL *s)
 #endif
 
     /*
-     * Given s->peer_ciphers and SSL_get_ciphers, we must pick a cipher
+     * Given s->peer_ciphers and SSL_get_ciphers, we must pick a cipher 
      */
 
     if (!s->hit || SSL_IS_TLS13(s)) {
-        sk_SSL_CIPHER_free(s->peer_ciphers);
-        s->peer_ciphers = ciphers;
+        sk_SSL_CIPHER_free(s->peer_ciphers); 
+        s->peer_ciphers = ciphers; 
         if (ciphers == NULL) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                      SSL_F_TLS_EARLY_POST_PROCESS_CLIENT_HELLO,
@@ -2087,10 +2087,10 @@ static int tls_early_post_process_client_hello(SSL *s)
 #else
         s->session->compress_meth = (comp == NULL) ? 0 : comp->id;
 #endif
-        if (!tls1_set_server_sigalgs(s)) {
-            /* SSLfatal() already called */
-            goto err;
-        }
+        if (!tls1_set_server_sigalgs(s)) { 
+            /* SSLfatal() already called */ 
+            goto err; 
+        } 
     }
 
     sk_SSL_CIPHER_free(ciphers);
@@ -2259,25 +2259,25 @@ WORK_STATE tls_post_process_client_hello(SSL *s, WORK_STATE wst)
     if (wst == WORK_MORE_B) {
         if (!s->hit || SSL_IS_TLS13(s)) {
             /* Let cert callback update server certificates if required */
-            if (!s->hit && s->cert->cert_cb != NULL) {
-                int rv = s->cert->cert_cb(s, s->cert->cert_cb_arg);
-                if (rv == 0) {
-                    SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                             SSL_F_TLS_POST_PROCESS_CLIENT_HELLO,
-                             SSL_R_CERT_CB_ERROR);
+            if (!s->hit && s->cert->cert_cb != NULL) { 
+                int rv = s->cert->cert_cb(s, s->cert->cert_cb_arg); 
+                if (rv == 0) { 
+                    SSLfatal(s, SSL_AD_INTERNAL_ERROR, 
+                             SSL_F_TLS_POST_PROCESS_CLIENT_HELLO, 
+                             SSL_R_CERT_CB_ERROR); 
                     goto err;
                 }
-                if (rv < 0) {
-                    s->rwstate = SSL_X509_LOOKUP;
-                    return WORK_MORE_B;
-                }
-                s->rwstate = SSL_NOTHING;
+                if (rv < 0) { 
+                    s->rwstate = SSL_X509_LOOKUP; 
+                    return WORK_MORE_B; 
+                } 
+                s->rwstate = SSL_NOTHING; 
             }
 
             /* In TLSv1.3 we selected the ciphersuite before resumption */
             if (!SSL_IS_TLS13(s)) {
                 cipher =
-                    ssl3_choose_cipher(s, s->peer_ciphers, SSL_get_ciphers(s));
+                    ssl3_choose_cipher(s, s->peer_ciphers, SSL_get_ciphers(s)); 
 
                 if (cipher == NULL) {
                     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,