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

2 files changed, 113 insertions, 113 deletions

diff --git a/contrib/libs/openssl/crypto/seed/seed.c b/contrib/libs/openssl/crypto/seed/seed.c
index c3a1f183a5..95e71cc898 100644
--- a/contrib/libs/openssl/crypto/seed/seed.c
+++ b/contrib/libs/openssl/crypto/seed/seed.c
@@ -42,7 +42,7 @@
 # endif
 
 # include <openssl/seed.h>
-# include "seed_local.h"
+# include "seed_local.h" 
 
 # ifdef SS                      /* can get defined on Solaris by inclusion of
                                  * <stdlib.h> */
diff --git a/contrib/libs/openssl/crypto/seed/seed_local.h b/contrib/libs/openssl/crypto/seed/seed_local.h
index e3681f8bd4..036fcceba8 100644
--- a/contrib/libs/openssl/crypto/seed/seed_local.h
+++ b/contrib/libs/openssl/crypto/seed/seed_local.h
@@ -1,112 +1,112 @@
-/*
- * Copyright 2007-2018 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
- */
-
-/*
- * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Neither the name of author nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-#ifndef OSSL_CRYPTO_SEED_LOCAL_H
-# define OSSL_CRYPTO_SEED_LOCAL_H
-
-# include "openssl/e_os2.h"
-# include <openssl/seed.h>
-
-# ifdef SEED_LONG               /* need 32-bit type */
-typedef unsigned long seed_word;
-# else
-typedef unsigned int seed_word;
-# endif
-
-
-# define char2word(c, i)  \
-        (i) = ((((seed_word)(c)[0]) << 24) | (((seed_word)(c)[1]) << 16) | (((seed_word)(c)[2]) << 8) | ((seed_word)(c)[3]))
-
-# define word2char(l, c)  \
-        *((c)+0) = (unsigned char)((l)>>24) & 0xff; \
-        *((c)+1) = (unsigned char)((l)>>16) & 0xff; \
-        *((c)+2) = (unsigned char)((l)>> 8) & 0xff; \
-        *((c)+3) = (unsigned char)((l))     & 0xff
-
-# define KEYSCHEDULE_UPDATE0(T0, T1, X1, X2, X3, X4, KC)  \
-        (T0) = (X3);                                     \
-        (X3) = (((X3)<<8) ^ ((X4)>>24)) & 0xffffffff;    \
-        (X4) = (((X4)<<8) ^ ((T0)>>24)) & 0xffffffff;    \
-        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;    \
-        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff
-
-# define KEYSCHEDULE_UPDATE1(T0, T1, X1, X2, X3, X4, KC)  \
-        (T0) = (X1);                                     \
-        (X1) = (((X1)>>8) ^ ((X2)<<24)) & 0xffffffff;    \
-        (X2) = (((X2)>>8) ^ ((T0)<<24)) & 0xffffffff;    \
-        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;     \
-        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff
-
-# define KEYUPDATE_TEMP(T0, T1, K)   \
-        (K)[0] = G_FUNC((T0));      \
-        (K)[1] = G_FUNC((T1))
-
-# define XOR_SEEDBLOCK(DST, SRC)      \
-        ((DST))[0] ^= ((SRC))[0];    \
-        ((DST))[1] ^= ((SRC))[1];    \
-        ((DST))[2] ^= ((SRC))[2];    \
-        ((DST))[3] ^= ((SRC))[3]
-
-# define MOV_SEEDBLOCK(DST, SRC)      \
-        ((DST))[0] = ((SRC))[0];     \
-        ((DST))[1] = ((SRC))[1];     \
-        ((DST))[2] = ((SRC))[2];     \
-        ((DST))[3] = ((SRC))[3]
-
-# define CHAR2WORD(C, I)              \
-        char2word((C),    (I)[0]);    \
-        char2word((C+4),  (I)[1]);    \
-        char2word((C+8),  (I)[2]);    \
-        char2word((C+12), (I)[3])
-
-# define WORD2CHAR(I, C)              \
-        word2char((I)[0], (C));       \
-        word2char((I)[1], (C+4));     \
-        word2char((I)[2], (C+8));     \
-        word2char((I)[3], (C+12))
-
-# define E_SEED(T0, T1, X1, X2, X3, X4, rbase)   \
-        (T0) = (X3) ^ (ks->data)[(rbase)];       \
-        (T1) = (X4) ^ (ks->data)[(rbase)+1];     \
-        (T1) ^= (T0);                            \
-        (T1) = G_FUNC((T1));                     \
-        (T0) = ((T0) + (T1)) & 0xffffffff;       \
-        (T0) = G_FUNC((T0));                     \
-        (T1) = ((T1) + (T0)) & 0xffffffff;       \
-        (T1) = G_FUNC((T1));                     \
-        (T0) = ((T0) + (T1)) & 0xffffffff;       \
-        (X1) ^= (T0);                            \
-        (X2) ^= (T1)
-
-#endif                          /* OSSL_CRYPTO_SEED_LOCAL_H */
+/* 
+ * Copyright 2007-2018 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 
+ */ 
+ 
+/* 
+ * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Neither the name of author nor the names of its contributors may 
+ *    be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ * 
+ */ 
+#ifndef OSSL_CRYPTO_SEED_LOCAL_H 
+# define OSSL_CRYPTO_SEED_LOCAL_H 
+ 
+# include "openssl/e_os2.h" 
+# include <openssl/seed.h> 
+ 
+# ifdef SEED_LONG               /* need 32-bit type */ 
+typedef unsigned long seed_word; 
+# else 
+typedef unsigned int seed_word; 
+# endif 
+ 
+ 
+# define char2word(c, i)  \ 
+        (i) = ((((seed_word)(c)[0]) << 24) | (((seed_word)(c)[1]) << 16) | (((seed_word)(c)[2]) << 8) | ((seed_word)(c)[3])) 
+ 
+# define word2char(l, c)  \ 
+        *((c)+0) = (unsigned char)((l)>>24) & 0xff; \ 
+        *((c)+1) = (unsigned char)((l)>>16) & 0xff; \ 
+        *((c)+2) = (unsigned char)((l)>> 8) & 0xff; \ 
+        *((c)+3) = (unsigned char)((l))     & 0xff 
+ 
+# define KEYSCHEDULE_UPDATE0(T0, T1, X1, X2, X3, X4, KC)  \ 
+        (T0) = (X3);                                     \ 
+        (X3) = (((X3)<<8) ^ ((X4)>>24)) & 0xffffffff;    \ 
+        (X4) = (((X4)<<8) ^ ((T0)>>24)) & 0xffffffff;    \ 
+        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;    \ 
+        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff 
+ 
+# define KEYSCHEDULE_UPDATE1(T0, T1, X1, X2, X3, X4, KC)  \ 
+        (T0) = (X1);                                     \ 
+        (X1) = (((X1)>>8) ^ ((X2)<<24)) & 0xffffffff;    \ 
+        (X2) = (((X2)>>8) ^ ((T0)<<24)) & 0xffffffff;    \ 
+        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;     \ 
+        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff 
+ 
+# define KEYUPDATE_TEMP(T0, T1, K)   \ 
+        (K)[0] = G_FUNC((T0));      \ 
+        (K)[1] = G_FUNC((T1)) 
+ 
+# define XOR_SEEDBLOCK(DST, SRC)      \ 
+        ((DST))[0] ^= ((SRC))[0];    \ 
+        ((DST))[1] ^= ((SRC))[1];    \ 
+        ((DST))[2] ^= ((SRC))[2];    \ 
+        ((DST))[3] ^= ((SRC))[3] 
+ 
+# define MOV_SEEDBLOCK(DST, SRC)      \ 
+        ((DST))[0] = ((SRC))[0];     \ 
+        ((DST))[1] = ((SRC))[1];     \ 
+        ((DST))[2] = ((SRC))[2];     \ 
+        ((DST))[3] = ((SRC))[3] 
+ 
+# define CHAR2WORD(C, I)              \ 
+        char2word((C),    (I)[0]);    \ 
+        char2word((C+4),  (I)[1]);    \ 
+        char2word((C+8),  (I)[2]);    \ 
+        char2word((C+12), (I)[3]) 
+ 
+# define WORD2CHAR(I, C)              \ 
+        word2char((I)[0], (C));       \ 
+        word2char((I)[1], (C+4));     \ 
+        word2char((I)[2], (C+8));     \ 
+        word2char((I)[3], (C+12)) 
+ 
+# define E_SEED(T0, T1, X1, X2, X3, X4, rbase)   \ 
+        (T0) = (X3) ^ (ks->data)[(rbase)];       \ 
+        (T1) = (X4) ^ (ks->data)[(rbase)+1];     \ 
+        (T1) ^= (T0);                            \ 
+        (T1) = G_FUNC((T1));                     \ 
+        (T0) = ((T0) + (T1)) & 0xffffffff;       \ 
+        (T0) = G_FUNC((T0));                     \ 
+        (T1) = ((T1) + (T0)) & 0xffffffff;       \ 
+        (T1) = G_FUNC((T1));                     \ 
+        (T0) = ((T0) + (T1)) & 0xffffffff;       \ 
+        (X1) ^= (T0);                            \ 
+        (X2) ^= (T1) 
+ 
+#endif                          /* OSSL_CRYPTO_SEED_LOCAL_H */