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

6 files changed, 139 insertions, 139 deletions

diff --git a/contrib/libs/openssl/crypto/rc2/rc2_cbc.c b/contrib/libs/openssl/crypto/rc2/rc2_cbc.c
index 8aef6d1de4..17e86f690e 100644
--- a/contrib/libs/openssl/crypto/rc2/rc2_cbc.c
+++ b/contrib/libs/openssl/crypto/rc2/rc2_cbc.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_local.h" 
+#include "rc2_local.h"
 
 void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
                      RC2_KEY *ks, unsigned char *iv, int encrypt)
diff --git a/contrib/libs/openssl/crypto/rc2/rc2_ecb.c b/contrib/libs/openssl/crypto/rc2/rc2_ecb.c
index dc917d7d2d..8d9927cd58 100644
--- a/contrib/libs/openssl/crypto/rc2/rc2_ecb.c
+++ b/contrib/libs/openssl/crypto/rc2/rc2_ecb.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_local.h" 
+#include "rc2_local.h"
 #include <openssl/opensslv.h>
 
 /*-
diff --git a/contrib/libs/openssl/crypto/rc2/rc2_local.h b/contrib/libs/openssl/crypto/rc2/rc2_local.h
index f4cb02e7d2..e4dad94787 100644
--- a/contrib/libs/openssl/crypto/rc2/rc2_local.h
+++ b/contrib/libs/openssl/crypto/rc2/rc2_local.h
@@ -1,134 +1,134 @@
-/* 
- * Copyright 1995-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 
- */ 
- 
-#undef c2l 
-#define c2l(c,l)        (l =((unsigned long)(*((c)++)))    , \ 
-                         l|=((unsigned long)(*((c)++)))<< 8L, \ 
-                         l|=((unsigned long)(*((c)++)))<<16L, \ 
-                         l|=((unsigned long)(*((c)++)))<<24L) 
- 
-/* NOTE - c is not incremented as per c2l */ 
-#undef c2ln 
-#define c2ln(c,l1,l2,n) { \ 
-                        c+=n; \ 
-                        l1=l2=0; \ 
-                        switch (n) { \ 
-                        case 8: l2 =((unsigned long)(*(--(c))))<<24L; \ 
-                        /* fall thru */                               \ 
-                        case 7: l2|=((unsigned long)(*(--(c))))<<16L; \ 
-                        /* fall thru */                               \ 
-                        case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \ 
-                        /* fall thru */                               \ 
-                        case 5: l2|=((unsigned long)(*(--(c))));      \ 
-                        /* fall thru */                               \ 
-                        case 4: l1 =((unsigned long)(*(--(c))))<<24L; \ 
-                        /* fall thru */                               \ 
-                        case 3: l1|=((unsigned long)(*(--(c))))<<16L; \ 
-                        /* fall thru */                               \ 
-                        case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \ 
-                        /* fall thru */                               \ 
-                        case 1: l1|=((unsigned long)(*(--(c))));      \ 
-                                } \ 
-                        } 
- 
-#undef l2c 
-#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \ 
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ 
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ 
-                         *((c)++)=(unsigned char)(((l)>>24L)&0xff)) 
- 
-/* NOTE - c is not incremented as per l2c */ 
-#undef l2cn 
-#define l2cn(l1,l2,c,n) { \ 
-                        c+=n; \ 
-                        switch (n) { \ 
-                        case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \ 
-                        /* fall thru */                                     \ 
-                        case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \ 
-                        /* fall thru */                                     \ 
-                        case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \ 
-                        /* fall thru */                                     \ 
-                        case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \ 
-                        /* fall thru */                                     \ 
-                        case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \ 
-                        /* fall thru */                                     \ 
-                        case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \ 
-                        /* fall thru */                                     \ 
-                        case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \ 
-                        /* fall thru */                                     \ 
-                        case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \ 
-                                } \ 
-                        } 
- 
-/* NOTE - c is not incremented as per n2l */ 
-#define n2ln(c,l1,l2,n) { \ 
-                        c+=n; \ 
-                        l1=l2=0; \ 
-                        switch (n) { \ 
-                        case 8: l2 =((unsigned long)(*(--(c))))    ; \ 
-                        /* fall thru */                              \ 
-                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \ 
-                        /* fall thru */                              \ 
-                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \ 
-                        /* fall thru */                              \ 
-                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \ 
-                        /* fall thru */                              \ 
-                        case 4: l1 =((unsigned long)(*(--(c))))    ; \ 
-                        /* fall thru */                              \ 
-                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \ 
-                        /* fall thru */                              \ 
-                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \ 
-                        /* fall thru */                              \ 
-                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \ 
-                                } \ 
-                        } 
- 
-/* NOTE - c is not incremented as per l2n */ 
-#define l2nn(l1,l2,c,n) { \ 
-                        c+=n; \ 
-                        switch (n) { \ 
-                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \ 
-                        /* fall thru */                                    \ 
-                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \ 
-                        /* fall thru */                                    \ 
-                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \ 
-                        /* fall thru */                                    \ 
-                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \ 
-                        /* fall thru */                                    \ 
-                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \ 
-                        /* fall thru */                                    \ 
-                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \ 
-                        /* fall thru */                                    \ 
-                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \ 
-                        /* fall thru */                                    \ 
-                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \ 
-                                } \ 
-                        } 
- 
-#undef n2l 
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \ 
-                         l|=((unsigned long)(*((c)++)))<<16L, \ 
-                         l|=((unsigned long)(*((c)++)))<< 8L, \ 
-                         l|=((unsigned long)(*((c)++)))) 
- 
-#undef l2n 
-#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \ 
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ 
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ 
-                         *((c)++)=(unsigned char)(((l)     )&0xff)) 
- 
-#define C_RC2(n) \ 
-        t=(x0+(x1& ~x3)+(x2&x3)+ *(p0++))&0xffff; \ 
-        x0=(t<<1)|(t>>15); \ 
-        t=(x1+(x2& ~x0)+(x3&x0)+ *(p0++))&0xffff; \ 
-        x1=(t<<2)|(t>>14); \ 
-        t=(x2+(x3& ~x1)+(x0&x1)+ *(p0++))&0xffff; \ 
-        x2=(t<<3)|(t>>13); \ 
-        t=(x3+(x0& ~x2)+(x1&x2)+ *(p0++))&0xffff; \ 
-        x3=(t<<5)|(t>>11); 
+/*
+ * Copyright 1995-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
+ */
+
+#undef c2l
+#define c2l(c,l)        (l =((unsigned long)(*((c)++)))    , \
+                         l|=((unsigned long)(*((c)++)))<< 8L, \
+                         l|=((unsigned long)(*((c)++)))<<16L, \
+                         l|=((unsigned long)(*((c)++)))<<24L)
+
+/* NOTE - c is not incremented as per c2l */
+#undef c2ln
+#define c2ln(c,l1,l2,n) { \
+                        c+=n; \
+                        l1=l2=0; \
+                        switch (n) { \
+                        case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
+                        /* fall thru */                               \
+                        case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
+                        /* fall thru */                               \
+                        case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
+                        /* fall thru */                               \
+                        case 5: l2|=((unsigned long)(*(--(c))));      \
+                        /* fall thru */                               \
+                        case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
+                        /* fall thru */                               \
+                        case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
+                        /* fall thru */                               \
+                        case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
+                        /* fall thru */                               \
+                        case 1: l1|=((unsigned long)(*(--(c))));      \
+                                } \
+                        }
+
+#undef l2c
+#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
+                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
+                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
+                         *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+
+/* NOTE - c is not incremented as per l2c */
+#undef l2cn
+#define l2cn(l1,l2,c,n) { \
+                        c+=n; \
+                        switch (n) { \
+                        case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
+                        /* fall thru */                                     \
+                        case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
+                        /* fall thru */                                     \
+                        case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
+                        /* fall thru */                                     \
+                        case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \
+                        /* fall thru */                                     \
+                        case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
+                        /* fall thru */                                     \
+                        case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
+                        /* fall thru */                                     \
+                        case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
+                        /* fall thru */                                     \
+                        case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \
+                                } \
+                        }
+
+/* NOTE - c is not incremented as per n2l */
+#define n2ln(c,l1,l2,n) { \
+                        c+=n; \
+                        l1=l2=0; \
+                        switch (n) { \
+                        case 8: l2 =((unsigned long)(*(--(c))))    ; \
+                        /* fall thru */                              \
+                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
+                        /* fall thru */                              \
+                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \
+                        /* fall thru */                              \
+                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \
+                        /* fall thru */                              \
+                        case 4: l1 =((unsigned long)(*(--(c))))    ; \
+                        /* fall thru */                              \
+                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
+                        /* fall thru */                              \
+                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \
+                        /* fall thru */                              \
+                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \
+                                } \
+                        }
+
+/* NOTE - c is not incremented as per l2n */
+#define l2nn(l1,l2,c,n) { \
+                        c+=n; \
+                        switch (n) { \
+                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
+                        /* fall thru */                                    \
+                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
+                        /* fall thru */                                    \
+                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
+                        /* fall thru */                                    \
+                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
+                        /* fall thru */                                    \
+                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
+                        /* fall thru */                                    \
+                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
+                        /* fall thru */                                    \
+                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
+                        /* fall thru */                                    \
+                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
+                                } \
+                        }
+
+#undef n2l
+#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
+                         l|=((unsigned long)(*((c)++)))<<16L, \
+                         l|=((unsigned long)(*((c)++)))<< 8L, \
+                         l|=((unsigned long)(*((c)++))))
+
+#undef l2n
+#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
+                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
+                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
+                         *((c)++)=(unsigned char)(((l)     )&0xff))
+
+#define C_RC2(n) \
+        t=(x0+(x1& ~x3)+(x2&x3)+ *(p0++))&0xffff; \
+        x0=(t<<1)|(t>>15); \
+        t=(x1+(x2& ~x0)+(x3&x0)+ *(p0++))&0xffff; \
+        x1=(t<<2)|(t>>14); \
+        t=(x2+(x3& ~x1)+(x0&x1)+ *(p0++))&0xffff; \
+        x2=(t<<3)|(t>>13); \
+        t=(x3+(x0& ~x2)+(x1&x2)+ *(p0++))&0xffff; \
+        x3=(t<<5)|(t>>11);
diff --git a/contrib/libs/openssl/crypto/rc2/rc2_skey.c b/contrib/libs/openssl/crypto/rc2/rc2_skey.c
index 7ae3506512..60ebd42f26 100644
--- a/contrib/libs/openssl/crypto/rc2/rc2_skey.c
+++ b/contrib/libs/openssl/crypto/rc2/rc2_skey.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_local.h" 
+#include "rc2_local.h"
 
 static const unsigned char key_table[256] = {
     0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79,
diff --git a/contrib/libs/openssl/crypto/rc2/rc2cfb64.c b/contrib/libs/openssl/crypto/rc2/rc2cfb64.c
index 9eee503da3..8d1c3a4d8f 100644
--- a/contrib/libs/openssl/crypto/rc2/rc2cfb64.c
+++ b/contrib/libs/openssl/crypto/rc2/rc2cfb64.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_local.h" 
+#include "rc2_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.
diff --git a/contrib/libs/openssl/crypto/rc2/rc2ofb64.c b/contrib/libs/openssl/crypto/rc2/rc2ofb64.c
index cf1e5b9400..61b2c56434 100644
--- a/contrib/libs/openssl/crypto/rc2/rc2ofb64.c
+++ b/contrib/libs/openssl/crypto/rc2/rc2ofb64.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc2.h>
-#include "rc2_local.h" 
+#include "rc2_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.