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

6 files changed, 107 insertions, 107 deletions

diff --git a/contrib/libs/openssl/crypto/idea/i_cbc.c b/contrib/libs/openssl/crypto/idea/i_cbc.c
index e0f3b4e8a5..4eff467111 100644
--- a/contrib/libs/openssl/crypto/idea/i_cbc.c
+++ b/contrib/libs/openssl/crypto/idea/i_cbc.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_local.h" 
+#include "idea_local.h"
 
 void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out,
                       long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
diff --git a/contrib/libs/openssl/crypto/idea/i_cfb64.c b/contrib/libs/openssl/crypto/idea/i_cfb64.c
index 359bb17853..61c723015b 100644
--- a/contrib/libs/openssl/crypto/idea/i_cfb64.c
+++ b/contrib/libs/openssl/crypto/idea/i_cfb64.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_local.h" 
+#include "idea_local.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.
diff --git a/contrib/libs/openssl/crypto/idea/i_ecb.c b/contrib/libs/openssl/crypto/idea/i_ecb.c
index f301f12441..cb724e1a6c 100644
--- a/contrib/libs/openssl/crypto/idea/i_ecb.c
+++ b/contrib/libs/openssl/crypto/idea/i_ecb.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_local.h" 
+#include "idea_local.h"
 #include <openssl/opensslv.h>
 
 const char *IDEA_options(void)
diff --git a/contrib/libs/openssl/crypto/idea/i_ofb64.c b/contrib/libs/openssl/crypto/idea/i_ofb64.c
index 6095bbb47f..f000ced586 100644
--- a/contrib/libs/openssl/crypto/idea/i_ofb64.c
+++ b/contrib/libs/openssl/crypto/idea/i_ofb64.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_local.h" 
+#include "idea_local.h"
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.
diff --git a/contrib/libs/openssl/crypto/idea/i_skey.c b/contrib/libs/openssl/crypto/idea/i_skey.c
index 816a1cfb26..230338d7e3 100644
--- a/contrib/libs/openssl/crypto/idea/i_skey.c
+++ b/contrib/libs/openssl/crypto/idea/i_skey.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/idea.h>
-#include "idea_local.h" 
+#include "idea_local.h"
 
 static IDEA_INT inverse(unsigned int xin);
 void IDEA_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
diff --git a/contrib/libs/openssl/crypto/idea/idea_local.h b/contrib/libs/openssl/crypto/idea/idea_local.h
index 449c142165..50f81dfd8d 100644
--- a/contrib/libs/openssl/crypto/idea/idea_local.h
+++ b/contrib/libs/openssl/crypto/idea/idea_local.h
@@ -1,102 +1,102 @@
-/* 
- * 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 
- */ 
- 
-#define idea_mul(r,a,b,ul) \ 
-ul=(unsigned long)a*b; \ 
-if (ul != 0) \ 
-        { \ 
-        r=(ul&0xffff)-(ul>>16); \ 
-        r-=((r)>>16); \ 
-        } \ 
-else \ 
-        r=(-(int)a-b+1);        /* assuming a or b is 0 and in range */ 
- 
-/* 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)) 
- 
-#undef s2n 
-#define s2n(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \ 
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff)) 
- 
-#undef n2s 
-#define n2s(c,l)        (l =((IDEA_INT)(*((c)++)))<< 8L, \ 
-                         l|=((IDEA_INT)(*((c)++)))      ) 
- 
- 
-#define E_IDEA(num) \ 
-        x1&=0xffff; \ 
-        idea_mul(x1,x1,*p,ul); p++; \ 
-        x2+= *(p++); \ 
-        x3+= *(p++); \ 
-        x4&=0xffff; \ 
-        idea_mul(x4,x4,*p,ul); p++; \ 
-        t0=(x1^x3)&0xffff; \ 
-        idea_mul(t0,t0,*p,ul); p++; \ 
-        t1=(t0+(x2^x4))&0xffff; \ 
-        idea_mul(t1,t1,*p,ul); p++; \ 
-        t0+=t1; \ 
-        x1^=t1; \ 
-        x4^=t0; \ 
-        ul=x2^t0; /* do the swap to x3 */ \ 
-        x2=x3^t1; \ 
-        x3=ul; 
+/*
+ * 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
+ */
+
+#define idea_mul(r,a,b,ul) \
+ul=(unsigned long)a*b; \
+if (ul != 0) \
+        { \
+        r=(ul&0xffff)-(ul>>16); \
+        r-=((r)>>16); \
+        } \
+else \
+        r=(-(int)a-b+1);        /* assuming a or b is 0 and in range */
+
+/* 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))
+
+#undef s2n
+#define s2n(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
+                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff))
+
+#undef n2s
+#define n2s(c,l)        (l =((IDEA_INT)(*((c)++)))<< 8L, \
+                         l|=((IDEA_INT)(*((c)++)))      )
+
+
+#define E_IDEA(num) \
+        x1&=0xffff; \
+        idea_mul(x1,x1,*p,ul); p++; \
+        x2+= *(p++); \
+        x3+= *(p++); \
+        x4&=0xffff; \
+        idea_mul(x4,x4,*p,ul); p++; \
+        t0=(x1^x3)&0xffff; \
+        idea_mul(t0,t0,*p,ul); p++; \
+        t1=(t0+(x2^x4))&0xffff; \
+        idea_mul(t1,t1,*p,ul); p++; \
+        t0+=t1; \
+        x1^=t1; \
+        x4^=t0; \
+        ul=x2^t0; /* do the swap to x3 */ \
+        x2=x3^t1; \
+        x3=ul;