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

3 files changed, 82 insertions, 82 deletions

diff --git a/contrib/libs/openssl/crypto/sm3/m_sm3.c b/contrib/libs/openssl/crypto/sm3/m_sm3.c
index 7e54f42984..f4b3367dcd 100644
--- a/contrib/libs/openssl/crypto/sm3/m_sm3.c
+++ b/contrib/libs/openssl/crypto/sm3/m_sm3.c
@@ -12,8 +12,8 @@
 
 #ifndef OPENSSL_NO_SM3
 # include <openssl/evp.h>
-# include "crypto/evp.h"
-# include "crypto/sm3.h"
+# include "crypto/evp.h" 
+# include "crypto/sm3.h" 
 
 static int init(EVP_MD_CTX *ctx)
 {
diff --git a/contrib/libs/openssl/crypto/sm3/sm3.c b/contrib/libs/openssl/crypto/sm3/sm3.c
index d78292b4c5..ef4371359e 100644
--- a/contrib/libs/openssl/crypto/sm3/sm3.c
+++ b/contrib/libs/openssl/crypto/sm3/sm3.c
@@ -10,7 +10,7 @@
  */
 
 #include <openssl/e_os2.h>
-#include "sm3_local.h"
+#include "sm3_local.h" 
 
 int sm3_init(SM3_CTX *c)
 {
diff --git a/contrib/libs/openssl/crypto/sm3/sm3_local.h b/contrib/libs/openssl/crypto/sm3/sm3_local.h
index 7171de510d..b3658aeb22 100644
--- a/contrib/libs/openssl/crypto/sm3/sm3_local.h
+++ b/contrib/libs/openssl/crypto/sm3/sm3_local.h
@@ -1,79 +1,79 @@
-/*
- * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
- * Copyright 2017 Ribose Inc. All Rights Reserved.
- * Ported from Ribose contributions from Botan.
- *
- * 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
- */
-
-#include <string.h>
-#include "crypto/sm3.h"
-
-#define DATA_ORDER_IS_BIG_ENDIAN
-
-#define HASH_LONG               SM3_WORD
-#define HASH_CTX                SM3_CTX
-#define HASH_CBLOCK             SM3_CBLOCK
-#define HASH_UPDATE             sm3_update
-#define HASH_TRANSFORM          sm3_transform
-#define HASH_FINAL              sm3_final
-#define HASH_MAKE_STRING(c, s)              \
-      do {                                  \
-        unsigned long ll;                   \
-        ll=(c)->A; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->B; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->C; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->D; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->E; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->F; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->G; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->H; (void)HOST_l2c(ll, (s)); \
-      } while (0)
-#define HASH_BLOCK_DATA_ORDER   sm3_block_data_order
-
-void sm3_transform(SM3_CTX *c, const unsigned char *data);
-
-#include "crypto/md32_common.h"
-
-#define P0(X) (X ^ ROTATE(X, 9) ^ ROTATE(X, 17))
-#define P1(X) (X ^ ROTATE(X, 15) ^ ROTATE(X, 23))
-
-#define FF0(X,Y,Z) (X ^ Y ^ Z)
-#define GG0(X,Y,Z) (X ^ Y ^ Z)
-
-#define FF1(X,Y,Z) ((X & Y) | ((X | Y) & Z))
-#define GG1(X,Y,Z) ((Z ^ (X & (Y ^ Z))))
-
-#define EXPAND(W0,W7,W13,W3,W10) \
-   (P1(W0 ^ W7 ^ ROTATE(W13, 15)) ^ ROTATE(W3, 7) ^ W10)
-
-#define RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF, GG)           \
-     do {                                                         \
-       const SM3_WORD A12 = ROTATE(A, 12);                        \
-       const SM3_WORD A12_SM = A12 + E + TJ;                      \
-       const SM3_WORD SS1 = ROTATE(A12_SM, 7);                    \
-       const SM3_WORD TT1 = FF(A, B, C) + D + (SS1 ^ A12) + (Wj); \
-       const SM3_WORD TT2 = GG(E, F, G) + H + SS1 + Wi;           \
-       B = ROTATE(B, 9);                                          \
-       D = TT1;                                                   \
-       F = ROTATE(F, 19);                                         \
-       H = P0(TT2);                                               \
-     } while(0)
-
-#define R1(A,B,C,D,E,F,G,H,TJ,Wi,Wj) \
-   RND(A,B,C,D,E,F,G,H,TJ,Wi,Wj,FF0,GG0)
-
-#define R2(A,B,C,D,E,F,G,H,TJ,Wi,Wj) \
-   RND(A,B,C,D,E,F,G,H,TJ,Wi,Wj,FF1,GG1)
-
-#define SM3_A 0x7380166fUL
-#define SM3_B 0x4914b2b9UL
-#define SM3_C 0x172442d7UL
-#define SM3_D 0xda8a0600UL
-#define SM3_E 0xa96f30bcUL
-#define SM3_F 0x163138aaUL
-#define SM3_G 0xe38dee4dUL
-#define SM3_H 0xb0fb0e4eUL
+/* 
+ * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. 
+ * Copyright 2017 Ribose Inc. All Rights Reserved. 
+ * Ported from Ribose contributions from Botan. 
+ * 
+ * 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 
+ */ 
+ 
+#include <string.h> 
+#include "crypto/sm3.h" 
+ 
+#define DATA_ORDER_IS_BIG_ENDIAN 
+ 
+#define HASH_LONG               SM3_WORD 
+#define HASH_CTX                SM3_CTX 
+#define HASH_CBLOCK             SM3_CBLOCK 
+#define HASH_UPDATE             sm3_update 
+#define HASH_TRANSFORM          sm3_transform 
+#define HASH_FINAL              sm3_final 
+#define HASH_MAKE_STRING(c, s)              \ 
+      do {                                  \ 
+        unsigned long ll;                   \ 
+        ll=(c)->A; (void)HOST_l2c(ll, (s)); \ 
+        ll=(c)->B; (void)HOST_l2c(ll, (s)); \ 
+        ll=(c)->C; (void)HOST_l2c(ll, (s)); \ 
+        ll=(c)->D; (void)HOST_l2c(ll, (s)); \ 
+        ll=(c)->E; (void)HOST_l2c(ll, (s)); \ 
+        ll=(c)->F; (void)HOST_l2c(ll, (s)); \ 
+        ll=(c)->G; (void)HOST_l2c(ll, (s)); \ 
+        ll=(c)->H; (void)HOST_l2c(ll, (s)); \ 
+      } while (0) 
+#define HASH_BLOCK_DATA_ORDER   sm3_block_data_order 
+ 
+void sm3_transform(SM3_CTX *c, const unsigned char *data); 
+ 
+#include "crypto/md32_common.h" 
+ 
+#define P0(X) (X ^ ROTATE(X, 9) ^ ROTATE(X, 17)) 
+#define P1(X) (X ^ ROTATE(X, 15) ^ ROTATE(X, 23)) 
+ 
+#define FF0(X,Y,Z) (X ^ Y ^ Z) 
+#define GG0(X,Y,Z) (X ^ Y ^ Z) 
+ 
+#define FF1(X,Y,Z) ((X & Y) | ((X | Y) & Z)) 
+#define GG1(X,Y,Z) ((Z ^ (X & (Y ^ Z)))) 
+ 
+#define EXPAND(W0,W7,W13,W3,W10) \ 
+   (P1(W0 ^ W7 ^ ROTATE(W13, 15)) ^ ROTATE(W3, 7) ^ W10) 
+ 
+#define RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF, GG)           \ 
+     do {                                                         \ 
+       const SM3_WORD A12 = ROTATE(A, 12);                        \ 
+       const SM3_WORD A12_SM = A12 + E + TJ;                      \ 
+       const SM3_WORD SS1 = ROTATE(A12_SM, 7);                    \ 
+       const SM3_WORD TT1 = FF(A, B, C) + D + (SS1 ^ A12) + (Wj); \ 
+       const SM3_WORD TT2 = GG(E, F, G) + H + SS1 + Wi;           \ 
+       B = ROTATE(B, 9);                                          \ 
+       D = TT1;                                                   \ 
+       F = ROTATE(F, 19);                                         \ 
+       H = P0(TT2);                                               \ 
+     } while(0) 
+ 
+#define R1(A,B,C,D,E,F,G,H,TJ,Wi,Wj) \ 
+   RND(A,B,C,D,E,F,G,H,TJ,Wi,Wj,FF0,GG0) 
+ 
+#define R2(A,B,C,D,E,F,G,H,TJ,Wi,Wj) \ 
+   RND(A,B,C,D,E,F,G,H,TJ,Wi,Wj,FF1,GG1) 
+ 
+#define SM3_A 0x7380166fUL 
+#define SM3_B 0x4914b2b9UL 
+#define SM3_C 0x172442d7UL 
+#define SM3_D 0xda8a0600UL 
+#define SM3_E 0xa96f30bcUL 
+#define SM3_F 0x163138aaUL 
+#define SM3_G 0xe38dee4dUL 
+#define SM3_H 0xb0fb0e4eUL