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

6 files changed, 133 insertions, 133 deletions

diff --git a/contrib/libs/openssl/crypto/evp/bio_ok.c b/contrib/libs/openssl/crypto/evp/bio_ok.c
index 9610f3c1ef..77886f1698 100644
--- a/contrib/libs/openssl/crypto/evp/bio_ok.c
+++ b/contrib/libs/openssl/crypto/evp/bio_ok.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -203,7 +203,7 @@ static int ok_read(BIO *b, char *out, int outl)
                 /*
                  * copy start of the next block into proper place
                  */
-                if (ctx->buf_len_save > ctx->buf_off_save) {
+                if (ctx->buf_len_save > ctx->buf_off_save) { 
                     ctx->buf_len = ctx->buf_len_save - ctx->buf_off_save;
                     memmove(ctx->buf, &(ctx->buf[ctx->buf_off_save]),
                             ctx->buf_len);
diff --git a/contrib/libs/openssl/crypto/evp/e_aes.c b/contrib/libs/openssl/crypto/evp/e_aes.c
index 2c2812fdf1..65f9b74696 100644
--- a/contrib/libs/openssl/crypto/evp/e_aes.c
+++ b/contrib/libs/openssl/crypto/evp/e_aes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2021 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
@@ -614,22 +614,22 @@ void aes_t4_decrypt(const unsigned char *in, unsigned char *out,
  */
 void aes128_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+                           unsigned char *ivec, int /*unused*/); 
 void aes128_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+                           unsigned char *ivec, int /*unused*/); 
 void aes192_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+                           unsigned char *ivec, int /*unused*/); 
 void aes192_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+                           unsigned char *ivec, int /*unused*/); 
 void aes256_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+                           unsigned char *ivec, int /*unused*/); 
 void aes256_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+                           unsigned char *ivec, int /*unused*/); 
 void aes128_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
                              size_t blocks, const AES_KEY *key,
                              unsigned char *ivec);
@@ -1171,9 +1171,9 @@ typedef struct {
 static int s390x_aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                               const unsigned char *iv, int enc);
 
-# define S390X_aes_128_cbc_CAPABLE	0	/* checked by callee */
-# define S390X_aes_192_cbc_CAPABLE	0
-# define S390X_aes_256_cbc_CAPABLE	0
+# define S390X_aes_128_cbc_CAPABLE	0	/* checked by callee */ 
+# define S390X_aes_192_cbc_CAPABLE	0 
+# define S390X_aes_256_cbc_CAPABLE	0 
 # define S390X_AES_CBC_CTX		EVP_AES_KEY
 
 # define s390x_aes_cbc_init_key aes_init_key
@@ -1193,11 +1193,11 @@ static int s390x_aes_ecb_init_key(EVP_CIPHER_CTX *ctx,
     S390X_AES_ECB_CTX *cctx = EVP_C_DATA(S390X_AES_ECB_CTX, ctx);
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
 
-    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT);
-
-    if (key != NULL)
-        memcpy(cctx->km.param.k, key, keylen);
+    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT); 
 
+    if (key != NULL) 
+        memcpy(cctx->km.param.k, key, keylen); 
+ 
     return 1;
 }
 
@@ -1225,17 +1225,17 @@ static int s390x_aes_ofb_init_key(EVP_CIPHER_CTX *ctx,
                                   const unsigned char *ivec, int enc)
 {
     S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
-    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx);
+    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx); 
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
     const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
 
     cctx->fc = S390X_AES_FC(keylen);
-
-    if (key != NULL)
-        memcpy(cctx->kmo.param.k, key, keylen);
-
+ 
+    if (key != NULL) 
+        memcpy(cctx->kmo.param.k, key, keylen); 
+ 
     cctx->res = 0;
-    memcpy(cctx->kmo.param.cv, oiv, ivlen);
+    memcpy(cctx->kmo.param.cv, oiv, ivlen); 
     return 1;
 }
 
@@ -1243,12 +1243,12 @@ static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                                 const unsigned char *in, size_t len)
 {
     S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
-    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
-    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
+    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx); 
+    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); 
     int n = cctx->res;
     int rem;
 
-    memcpy(cctx->kmo.param.cv, iv, ivlen);
+    memcpy(cctx->kmo.param.cv, iv, ivlen); 
     while (n && len) {
         *out = *in ^ cctx->kmo.param.cv[n];
         n = (n + 1) & 0xf;
@@ -1277,7 +1277,7 @@ static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         }
     }
 
-    memcpy(iv, cctx->kmo.param.cv, ivlen);
+    memcpy(iv, cctx->kmo.param.cv, ivlen); 
     cctx->res = n;
     return 1;
 }
@@ -1297,18 +1297,18 @@ static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx,
                                   const unsigned char *ivec, int enc)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
-    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx);
+    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx); 
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
     const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
 
-    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT)
-               | (16 << 24); /* 16 bytes cipher feedback */
-
-    if (key != NULL)
-        memcpy(cctx->kmf.param.k, key, keylen);
+    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT) 
+               | (16 << 24); /* 16 bytes cipher feedback */ 
 
+    if (key != NULL) 
+        memcpy(cctx->kmf.param.k, key, keylen); 
+ 
     cctx->res = 0;
-    memcpy(cctx->kmf.param.cv, oiv, ivlen);
+    memcpy(cctx->kmf.param.cv, oiv, ivlen); 
     return 1;
 }
 
@@ -1318,13 +1318,13 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
     const int enc = EVP_CIPHER_CTX_encrypting(ctx);
-    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
-    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
+    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx); 
+    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); 
     int n = cctx->res;
     int rem;
     unsigned char tmp;
 
-    memcpy(cctx->kmf.param.cv, iv, ivlen);
+    memcpy(cctx->kmf.param.cv, iv, ivlen); 
     while (n && len) {
         tmp = *in;
         *out = cctx->kmf.param.cv[n] ^ tmp;
@@ -1357,7 +1357,7 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         }
     }
 
-    memcpy(iv, cctx->kmf.param.cv, ivlen);
+    memcpy(iv, cctx->kmf.param.cv, ivlen); 
     cctx->res = n;
     return 1;
 }
@@ -1374,18 +1374,18 @@ static int s390x_aes_cfb8_init_key(EVP_CIPHER_CTX *ctx,
                                    const unsigned char *ivec, int enc)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
-    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx);
+    const unsigned char *oiv = EVP_CIPHER_CTX_original_iv(ctx); 
     const int keylen = EVP_CIPHER_CTX_key_length(ctx);
     const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
 
-    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT)
-               | (1 << 24); /* 1 byte cipher feedback flag */
-
-    if (key != NULL)
-        memcpy(cctx->kmf.param.k, key, keylen);
+    cctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT) 
+               | (1 << 24); /* 1 byte cipher feedback flag */ 
 
-    cctx->res = 0;
-    memcpy(cctx->kmf.param.cv, oiv, ivlen);
+    if (key != NULL) 
+        memcpy(cctx->kmf.param.k, key, keylen); 
+ 
+    cctx->res = 0; 
+    memcpy(cctx->kmf.param.cv, oiv, ivlen); 
     return 1;
 }
 
@@ -1393,12 +1393,12 @@ static int s390x_aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                                  const unsigned char *in, size_t len)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
-    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx);
-    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
+    const int ivlen = EVP_CIPHER_CTX_iv_length(ctx); 
+    unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx); 
 
-    memcpy(cctx->kmf.param.cv, iv, ivlen);
+    memcpy(cctx->kmf.param.cv, iv, ivlen); 
     s390x_kmf(in, len, out, cctx->fc, &cctx->kmf.param);
-    memcpy(iv, cctx->kmf.param.cv, ivlen);
+    memcpy(iv, cctx->kmf.param.cv, ivlen); 
     return 1;
 }
 
@@ -1412,9 +1412,9 @@ static int s390x_aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 static int s390x_aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                                  const unsigned char *in, size_t len);
 
-# define S390X_aes_128_ctr_CAPABLE	0	/* checked by callee */
-# define S390X_aes_192_ctr_CAPABLE	0
-# define S390X_aes_256_ctr_CAPABLE	0
+# define S390X_aes_128_ctr_CAPABLE	0	/* checked by callee */ 
+# define S390X_aes_192_ctr_CAPABLE	0 
+# define S390X_aes_256_ctr_CAPABLE	0 
 # define S390X_AES_CTR_CTX		EVP_AES_KEY
 
 # define s390x_aes_ctr_init_key aes_init_key
@@ -1582,7 +1582,7 @@ static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
 /*-
  * Initialize context structure. Code is big-endian.
  */
-static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx)
+static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx) 
 {
     ctx->kma.param.t.g[0] = 0;
     ctx->kma.param.t.g[1] = 0;
@@ -1593,7 +1593,7 @@ static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx)
     ctx->kreslen = 0;
 
     if (ctx->ivlen == 12) {
-        memcpy(&ctx->kma.param.j0, ctx->iv, ctx->ivlen);
+        memcpy(&ctx->kma.param.j0, ctx->iv, ctx->ivlen); 
         ctx->kma.param.j0.w[3] = 1;
         ctx->kma.param.cv.w = 1;
     } else {
@@ -1711,7 +1711,7 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
         if (gctx->iv_gen == 0 || gctx->key_set == 0)
             return 0;
 
-        s390x_aes_gcm_setiv(gctx);
+        s390x_aes_gcm_setiv(gctx); 
 
         if (arg <= 0 || arg > gctx->ivlen)
             arg = gctx->ivlen;
@@ -1731,7 +1731,7 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
             return 0;
 
         memcpy(gctx->iv + gctx->ivlen - arg, ptr, arg);
-        s390x_aes_gcm_setiv(gctx);
+        s390x_aes_gcm_setiv(gctx); 
         gctx->iv_set = 1;
         return 1;
 
@@ -1787,36 +1787,36 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 }
 
 /*-
- * Set key or iv or enc/dec. Returns 1 on success. Otherwise 0 is returned.
+ * Set key or iv or enc/dec. Returns 1 on success. Otherwise 0 is returned. 
  */
 static int s390x_aes_gcm_init_key(EVP_CIPHER_CTX *ctx,
                                   const unsigned char *key,
                                   const unsigned char *iv, int enc)
 {
     S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
-    const int keylen = EVP_CIPHER_CTX_key_length(ctx);
+    const int keylen = EVP_CIPHER_CTX_key_length(ctx); 
 
-    gctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT);
+    gctx->fc = S390X_AES_FC(keylen) | (enc ? 0 : S390X_DECRYPT); 
 
     if (key != NULL) {
-        gctx->fc &= ~S390X_KMA_HS;
+        gctx->fc &= ~S390X_KMA_HS; 
         memcpy(&gctx->kma.param.k, key, keylen);
         gctx->key_set = 1;
-    }
+    } 
 
-    if (iv != NULL) {
-        memcpy(gctx->iv, iv, gctx->ivlen);
-        gctx->iv_gen = 0;
+    if (iv != NULL) { 
+        memcpy(gctx->iv, iv, gctx->ivlen); 
+        gctx->iv_gen = 0; 
         gctx->iv_set = 1;
     }
-
-    if (gctx->key_set && gctx->iv_set)
-            s390x_aes_gcm_setiv(gctx);
-
-    gctx->fc &= ~(S390X_KMA_LPC | S390X_KMA_LAAD);
-    gctx->areslen = 0;
-    gctx->mreslen = 0;
-    gctx->kreslen = 0;
+ 
+    if (gctx->key_set && gctx->iv_set) 
+            s390x_aes_gcm_setiv(gctx); 
+ 
+    gctx->fc &= ~(S390X_KMA_LPC | S390X_KMA_LAAD); 
+    gctx->areslen = 0; 
+    gctx->mreslen = 0; 
+    gctx->kreslen = 0; 
     return 1;
 }
 
@@ -1938,8 +1938,8 @@ static int s390x_aes_gcm_cleanup(EVP_CIPHER_CTX *c)
 }
 
 # define S390X_AES_XTS_CTX		EVP_AES_XTS_CTX
-# define S390X_aes_128_xts_CAPABLE	0	/* checked by callee */
-# define S390X_aes_256_xts_CAPABLE	0
+# define S390X_aes_128_xts_CAPABLE	0	/* checked by callee */ 
+# define S390X_aes_256_xts_CAPABLE	0 
 
 # define s390x_aes_xts_init_key aes_xts_init_key
 static int s390x_aes_xts_init_key(EVP_CIPHER_CTX *ctx,
@@ -2143,10 +2143,10 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                                     const unsigned char *in, size_t len)
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
-    const unsigned char *ivec = EVP_CIPHER_CTX_iv(ctx);
+    const unsigned char *ivec = EVP_CIPHER_CTX_iv(ctx); 
     unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
     const int enc = EVP_CIPHER_CTX_encrypting(ctx);
-    unsigned char iv[EVP_MAX_IV_LENGTH];
+    unsigned char iv[EVP_MAX_IV_LENGTH]; 
 
     if (out != in
             || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->aes.ccm.m))
@@ -2162,9 +2162,9 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      * Get explicit iv (sequence number). We already have fixed iv
      * (server/client_write_iv) here.
      */
-    memcpy(iv, ivec, sizeof(iv));
-    memcpy(iv + EVP_CCM_TLS_FIXED_IV_LEN, in, EVP_CCM_TLS_EXPLICIT_IV_LEN);
-    s390x_aes_ccm_setiv(cctx, iv, len);
+    memcpy(iv, ivec, sizeof(iv)); 
+    memcpy(iv + EVP_CCM_TLS_FIXED_IV_LEN, in, EVP_CCM_TLS_EXPLICIT_IV_LEN); 
+    s390x_aes_ccm_setiv(cctx, iv, len); 
 
     /* Process aad (sequence number|type|version|length) */
     s390x_aes_ccm_aad(cctx, buf, cctx->aes.ccm.tls_aad_len);
@@ -2191,18 +2191,18 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 /*-
- * Set key or iv or enc/dec. Returns 1 if successful.
- * Otherwise 0 is returned.
+ * Set key or iv or enc/dec. Returns 1 if successful. 
+ * Otherwise 0 is returned. 
  */
 static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
                                   const unsigned char *key,
                                   const unsigned char *iv, int enc)
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
-    const int keylen  = EVP_CIPHER_CTX_key_length(ctx);
-    unsigned char *ivec = EVP_CIPHER_CTX_iv_noconst(ctx);
+    const int keylen  = EVP_CIPHER_CTX_key_length(ctx); 
+    unsigned char *ivec = EVP_CIPHER_CTX_iv_noconst(ctx); 
 
-    cctx->aes.ccm.fc = S390X_AES_FC(keylen);
+    cctx->aes.ccm.fc = S390X_AES_FC(keylen); 
 
     if (key != NULL) {
         memcpy(cctx->aes.ccm.kmac_param.k, key, keylen);
@@ -2213,13 +2213,13 @@ static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
         cctx->aes.ccm.iv_set = 1;
     }
 
-    /* Store encoded m and l. */
-    cctx->aes.ccm.nonce.b[0] = ((cctx->aes.ccm.l - 1) & 0x7)
-                             | (((cctx->aes.ccm.m - 2) >> 1) & 0x7) << 3;
-    memset(cctx->aes.ccm.nonce.b + 1, 0, sizeof(cctx->aes.ccm.nonce.b) - 1);
-
-    cctx->aes.ccm.blocks = 0;
-    cctx->aes.ccm.len_set = 0;
+    /* Store encoded m and l. */ 
+    cctx->aes.ccm.nonce.b[0] = ((cctx->aes.ccm.l - 1) & 0x7) 
+                             | (((cctx->aes.ccm.m - 2) >> 1) & 0x7) << 3; 
+    memset(cctx->aes.ccm.nonce.b + 1, 0, sizeof(cctx->aes.ccm.nonce.b) - 1); 
+ 
+    cctx->aes.ccm.blocks = 0; 
+    cctx->aes.ccm.len_set = 0; 
     return 1;
 }
 
@@ -2234,8 +2234,8 @@ static int s390x_aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
     const int enc = EVP_CIPHER_CTX_encrypting(ctx);
-    const unsigned char *ivec = EVP_CIPHER_CTX_iv(ctx);
-    unsigned char *buf;
+    const unsigned char *ivec = EVP_CIPHER_CTX_iv(ctx); 
+    unsigned char *buf; 
     int rv;
 
     if (!cctx->aes.ccm.key_set)
@@ -2450,7 +2450,7 @@ static const EVP_CIPHER s390x_aes_##keylen##_##mode = {			\
     nid##_##keylen##_##nmode,blocksize,					\
     keylen / 8,								\
     ivlen,								\
-    flags | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_##MODE##_MODE,		\
+    flags | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_##MODE##_MODE,		\ 
     s390x_aes_##mode##_init_key,					\
     s390x_aes_##mode##_cipher,						\
     NULL,								\
@@ -2487,7 +2487,7 @@ static const EVP_CIPHER s390x_aes_##keylen##_##mode = {			\
     blocksize,								\
     (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * keylen / 8,	\
     ivlen,								\
-    flags | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_##MODE##_MODE,		\
+    flags | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_##MODE##_MODE,		\ 
     s390x_aes_##mode##_init_key,					\
     s390x_aes_##mode##_cipher,						\
     s390x_aes_##mode##_cleanup,						\
diff --git a/contrib/libs/openssl/crypto/evp/e_camellia.c b/contrib/libs/openssl/crypto/evp/e_camellia.c
index f8c0198012..7e03317bbd 100644
--- a/contrib/libs/openssl/crypto/evp/e_camellia.c
+++ b/contrib/libs/openssl/crypto/evp/e_camellia.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2021 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
@@ -55,16 +55,16 @@ void cmll_t4_decrypt(const unsigned char *in, unsigned char *out,
 
 void cmll128_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec, int /*unused*/);
+                            unsigned char *ivec, int /*unused*/); 
 void cmll128_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec, int /*unused*/);
+                            unsigned char *ivec, int /*unused*/); 
 void cmll256_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec, int /*unused*/);
+                            unsigned char *ivec, int /*unused*/); 
 void cmll256_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec, int /*unused*/);
+                            unsigned char *ivec, int /*unused*/); 
 void cmll128_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
                               size_t blocks, const CAMELLIA_KEY *key,
                               unsigned char *ivec);
diff --git a/contrib/libs/openssl/crypto/evp/encode.c b/contrib/libs/openssl/crypto/evp/encode.c
index 85926434c3..4b1b78d7d4 100644
--- a/contrib/libs/openssl/crypto/evp/encode.c
+++ b/contrib/libs/openssl/crypto/evp/encode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -423,7 +423,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
         table = data_ascii2bin;
 
     /* trim white space from the start of the line. */
-    while ((n > 0) && (conv_ascii2bin(*f, table) == B64_WS)) {
+    while ((n > 0) && (conv_ascii2bin(*f, table) == B64_WS)) { 
         f++;
         n--;
     }
diff --git a/contrib/libs/openssl/crypto/evp/evp_enc.c b/contrib/libs/openssl/crypto/evp/evp_enc.c
index e3c165d48e..fd220f74ea 100644
--- a/contrib/libs/openssl/crypto/evp/evp_enc.c
+++ b/contrib/libs/openssl/crypto/evp/evp_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 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
@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include <limits.h>
+#include <limits.h> 
 #include <assert.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
@@ -356,19 +356,19 @@ static int evp_EncryptDecryptUpdate(EVP_CIPHER_CTX *ctx,
             return 1;
         } else {
             j = bl - i;
-
-            /*
-             * Once we've processed the first j bytes from in, the amount of
-             * data left that is a multiple of the block length is:
-             * (inl - j) & ~(bl - 1)
-             * We must ensure that this amount of data, plus the one block that
-             * we process from ctx->buf does not exceed INT_MAX
-             */
-            if (((inl - j) & ~(bl - 1)) > INT_MAX - bl) {
-                EVPerr(EVP_F_EVP_ENCRYPTDECRYPTUPDATE,
-                       EVP_R_OUTPUT_WOULD_OVERFLOW);
-                return 0;
-            }
+ 
+            /* 
+             * Once we've processed the first j bytes from in, the amount of 
+             * data left that is a multiple of the block length is: 
+             * (inl - j) & ~(bl - 1) 
+             * We must ensure that this amount of data, plus the one block that 
+             * we process from ctx->buf does not exceed INT_MAX 
+             */ 
+            if (((inl - j) & ~(bl - 1)) > INT_MAX - bl) { 
+                EVPerr(EVP_F_EVP_ENCRYPTDECRYPTUPDATE, 
+                       EVP_R_OUTPUT_WOULD_OVERFLOW); 
+                return 0; 
+            } 
             memcpy(&(ctx->buf[i]), in, j);
             inl -= j;
             in += j;
@@ -516,19 +516,19 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
             EVPerr(EVP_F_EVP_DECRYPTUPDATE, EVP_R_PARTIALLY_OVERLAPPING);
             return 0;
         }
-        /*
-         * final_used is only ever set if buf_len is 0. Therefore the maximum
-         * length output we will ever see from evp_EncryptDecryptUpdate is
-         * the maximum multiple of the block length that is <= inl, or just:
-         * inl & ~(b - 1)
-         * Since final_used has been set then the final output length is:
-         * (inl & ~(b - 1)) + b
-         * This must never exceed INT_MAX
-         */
-        if ((inl & ~(b - 1)) > INT_MAX - b) {
-            EVPerr(EVP_F_EVP_DECRYPTUPDATE, EVP_R_OUTPUT_WOULD_OVERFLOW);
-            return 0;
-        }
+        /* 
+         * final_used is only ever set if buf_len is 0. Therefore the maximum 
+         * length output we will ever see from evp_EncryptDecryptUpdate is 
+         * the maximum multiple of the block length that is <= inl, or just: 
+         * inl & ~(b - 1) 
+         * Since final_used has been set then the final output length is: 
+         * (inl & ~(b - 1)) + b 
+         * This must never exceed INT_MAX 
+         */ 
+        if ((inl & ~(b - 1)) > INT_MAX - b) { 
+            EVPerr(EVP_F_EVP_DECRYPTUPDATE, EVP_R_OUTPUT_WOULD_OVERFLOW); 
+            return 0; 
+        } 
         memcpy(out, ctx->final, b);
         out += b;
         fix_len = 1;
diff --git a/contrib/libs/openssl/crypto/evp/evp_err.c b/contrib/libs/openssl/crypto/evp/evp_err.c
index 32ac0125de..cd04f529ea 100644
--- a/contrib/libs/openssl/crypto/evp/evp_err.c
+++ b/contrib/libs/openssl/crypto/evp/evp_err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 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
@@ -239,8 +239,8 @@ static const ERR_STRING_DATA EVP_str_reasons[] = {
     "operation not supported for this keytype"},
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATON_NOT_INITIALIZED),
     "operaton not initialized"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OUTPUT_WOULD_OVERFLOW),
-    "output would overflow"},
+    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OUTPUT_WOULD_OVERFLOW), 
+    "output would overflow"}, 
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARTIALLY_OVERLAPPING),
     "partially overlapping buffers"},
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PBKDF2_ERROR), "pbkdf2 error"},