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

6 files changed, 191 insertions, 191 deletions

diff --git a/contrib/libs/openssl/crypto/rc5/rc5_ecb.c b/contrib/libs/openssl/crypto/rc5/rc5_ecb.c
index 94ec646390..8c2c397914 100644
--- a/contrib/libs/openssl/crypto/rc5/rc5_ecb.c
+++ b/contrib/libs/openssl/crypto/rc5/rc5_ecb.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc5.h>
-#include "rc5_local.h"
+#include "rc5_local.h" 
 #include <openssl/opensslv.h>
 
 void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,
diff --git a/contrib/libs/openssl/crypto/rc5/rc5_enc.c b/contrib/libs/openssl/crypto/rc5/rc5_enc.c
index 75ddeb2eaf..6ef54623d0 100644
--- a/contrib/libs/openssl/crypto/rc5/rc5_enc.c
+++ b/contrib/libs/openssl/crypto/rc5/rc5_enc.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <openssl/rc5.h>
-#include "rc5_local.h"
+#include "rc5_local.h" 
 
 void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
                         long length, RC5_32_KEY *ks, unsigned char *iv,
diff --git a/contrib/libs/openssl/crypto/rc5/rc5_local.h b/contrib/libs/openssl/crypto/rc5/rc5_local.h
index 41130fe33b..44bf6e5289 100644
--- a/contrib/libs/openssl/crypto/rc5/rc5_local.h
+++ b/contrib/libs/openssl/crypto/rc5/rc5_local.h
@@ -1,186 +1,186 @@
-/*
- * 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
- */
-
-#include <stdlib.h>
-
-#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))
-
-#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER))
-# define ROTATE_l32(a,n)     _lrotl(a,n)
-# define ROTATE_r32(a,n)     _lrotr(a,n)
-#elif defined(__ICC)
-# define ROTATE_l32(a,n)     _rotl(a,n)
-# define ROTATE_r32(a,n)     _rotr(a,n)
-#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
-# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#  define ROTATE_l32(a,n)       ({ register unsigned int ret;   \
-                                        asm ("roll %%cl,%0"     \
-                                                : "=r"(ret)     \
-                                                : "c"(n),"0"((unsigned int)(a)) \
-                                                : "cc");        \
-                                        ret;                    \
-                                })
-#  define ROTATE_r32(a,n)       ({ register unsigned int ret;   \
-                                        asm ("rorl %%cl,%0"     \
-                                                : "=r"(ret)     \
-                                                : "c"(n),"0"((unsigned int)(a)) \
-                                                : "cc");        \
-                                        ret;                    \
-                                })
-# endif
-#endif
-#ifndef ROTATE_l32
-# define ROTATE_l32(a,n)     (((a)<<(n&0x1f))|(((a)&0xffffffff)>>((32-n)&0x1f)))
-#endif
-#ifndef ROTATE_r32
-# define ROTATE_r32(a,n)     (((a)<<((32-n)&0x1f))|(((a)&0xffffffff)>>(n&0x1f)))
-#endif
-
-#define RC5_32_MASK     0xffffffffL
-
-#define RC5_16_P        0xB7E1
-#define RC5_16_Q        0x9E37
-#define RC5_32_P        0xB7E15163L
-#define RC5_32_Q        0x9E3779B9L
-#define RC5_64_P        0xB7E151628AED2A6BLL
-#define RC5_64_Q        0x9E3779B97F4A7C15LL
-
-#define E_RC5_32(a,b,s,n) \
-        a^=b; \
-        a=ROTATE_l32(a,b); \
-        a+=s[n]; \
-        a&=RC5_32_MASK; \
-        b^=a; \
-        b=ROTATE_l32(b,a); \
-        b+=s[n+1]; \
-        b&=RC5_32_MASK;
-
-#define D_RC5_32(a,b,s,n) \
-        b-=s[n+1]; \
-        b&=RC5_32_MASK; \
-        b=ROTATE_r32(b,a); \
-        b^=a; \
-        a-=s[n]; \
-        a&=RC5_32_MASK; \
-        a=ROTATE_r32(a,b); \
-        a^=b;
+/* 
+ * 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 
+ */ 
+ 
+#include <stdlib.h> 
+ 
+#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)) 
+ 
+#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) 
+# define ROTATE_l32(a,n)     _lrotl(a,n) 
+# define ROTATE_r32(a,n)     _lrotr(a,n) 
+#elif defined(__ICC) 
+# define ROTATE_l32(a,n)     _rotl(a,n) 
+# define ROTATE_r32(a,n)     _rotr(a,n) 
+#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) 
+# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) 
+#  define ROTATE_l32(a,n)       ({ register unsigned int ret;   \ 
+                                        asm ("roll %%cl,%0"     \ 
+                                                : "=r"(ret)     \ 
+                                                : "c"(n),"0"((unsigned int)(a)) \ 
+                                                : "cc");        \ 
+                                        ret;                    \ 
+                                }) 
+#  define ROTATE_r32(a,n)       ({ register unsigned int ret;   \ 
+                                        asm ("rorl %%cl,%0"     \ 
+                                                : "=r"(ret)     \ 
+                                                : "c"(n),"0"((unsigned int)(a)) \ 
+                                                : "cc");        \ 
+                                        ret;                    \ 
+                                }) 
+# endif 
+#endif 
+#ifndef ROTATE_l32 
+# define ROTATE_l32(a,n)     (((a)<<(n&0x1f))|(((a)&0xffffffff)>>((32-n)&0x1f))) 
+#endif 
+#ifndef ROTATE_r32 
+# define ROTATE_r32(a,n)     (((a)<<((32-n)&0x1f))|(((a)&0xffffffff)>>(n&0x1f))) 
+#endif 
+ 
+#define RC5_32_MASK     0xffffffffL 
+ 
+#define RC5_16_P        0xB7E1 
+#define RC5_16_Q        0x9E37 
+#define RC5_32_P        0xB7E15163L 
+#define RC5_32_Q        0x9E3779B9L 
+#define RC5_64_P        0xB7E151628AED2A6BLL 
+#define RC5_64_Q        0x9E3779B97F4A7C15LL 
+ 
+#define E_RC5_32(a,b,s,n) \ 
+        a^=b; \ 
+        a=ROTATE_l32(a,b); \ 
+        a+=s[n]; \ 
+        a&=RC5_32_MASK; \ 
+        b^=a; \ 
+        b=ROTATE_l32(b,a); \ 
+        b+=s[n+1]; \ 
+        b&=RC5_32_MASK; 
+ 
+#define D_RC5_32(a,b,s,n) \ 
+        b-=s[n+1]; \ 
+        b&=RC5_32_MASK; \ 
+        b=ROTATE_r32(b,a); \ 
+        b^=a; \ 
+        a-=s[n]; \ 
+        a&=RC5_32_MASK; \ 
+        a=ROTATE_r32(a,b); \ 
+        a^=b; 
diff --git a/contrib/libs/openssl/crypto/rc5/rc5_skey.c b/contrib/libs/openssl/crypto/rc5/rc5_skey.c
index b2e6bbb1af..06a1bc6318 100644
--- a/contrib/libs/openssl/crypto/rc5/rc5_skey.c
+++ b/contrib/libs/openssl/crypto/rc5/rc5_skey.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc5.h>
-#include "rc5_local.h"
+#include "rc5_local.h" 
 
 void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
                     int rounds)
diff --git a/contrib/libs/openssl/crypto/rc5/rc5cfb64.c b/contrib/libs/openssl/crypto/rc5/rc5cfb64.c
index cfce7ec1e8..27f392d8ee 100644
--- a/contrib/libs/openssl/crypto/rc5/rc5cfb64.c
+++ b/contrib/libs/openssl/crypto/rc5/rc5cfb64.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc5.h>
-#include "rc5_local.h"
+#include "rc5_local.h" 
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.
diff --git a/contrib/libs/openssl/crypto/rc5/rc5ofb64.c b/contrib/libs/openssl/crypto/rc5/rc5ofb64.c
index 224eb96857..aca9b3e793 100644
--- a/contrib/libs/openssl/crypto/rc5/rc5ofb64.c
+++ b/contrib/libs/openssl/crypto/rc5/rc5ofb64.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/rc5.h>
-#include "rc5_local.h"
+#include "rc5_local.h" 
 
 /*
  * The input and output encrypted as though 64bit ofb mode is being used.