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

14 files changed, 414 insertions, 414 deletions

diff --git a/contrib/libs/openssl/include/internal/conf.h b/contrib/libs/openssl/include/internal/conf.h
index 0f14e14632..163fea8de4 100644
--- a/contrib/libs/openssl/include/internal/conf.h
+++ b/contrib/libs/openssl/include/internal/conf.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_CONF_H 
-# define OSSL_INTERNAL_CONF_H 
+#ifndef OSSL_INTERNAL_CONF_H
+# define OSSL_INTERNAL_CONF_H
 
 #include <openssl/conf.h>
 
diff --git a/contrib/libs/openssl/include/internal/constant_time.h b/contrib/libs/openssl/include/internal/constant_time.h
index fd52ac5d26..6600a1d72a 100644
--- a/contrib/libs/openssl/include/internal/constant_time.h
+++ b/contrib/libs/openssl/include/internal/constant_time.h
@@ -1,387 +1,387 @@
-/* 
- * Copyright 2014-2019 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 
- */ 
- 
-#ifndef OSSL_INTERNAL_CONSTANT_TIME_H 
-# define OSSL_INTERNAL_CONSTANT_TIME_H 
- 
-# include <stdlib.h> 
-# include <string.h> 
-# include <openssl/e_os2.h>              /* For 'ossl_inline' */ 
- 
-/*- 
- * The boolean methods return a bitmask of all ones (0xff...f) for true 
- * and 0 for false. This is useful for choosing a value based on the result 
- * of a conditional in constant time. For example, 
- *      if (a < b) { 
- *        c = a; 
- *      } else { 
- *        c = b; 
- *      } 
- * can be written as 
- *      unsigned int lt = constant_time_lt(a, b); 
- *      c = constant_time_select(lt, a, b); 
- */ 
- 
-/* Returns the given value with the MSB copied to all the other bits. */ 
-static ossl_inline unsigned int constant_time_msb(unsigned int a); 
-/* Convenience method for uint32_t. */ 
-static ossl_inline uint32_t constant_time_msb_32(uint32_t a); 
-/* Convenience method for uint64_t. */ 
-static ossl_inline uint64_t constant_time_msb_64(uint64_t a); 
- 
-/* Returns 0xff..f if a < b and 0 otherwise. */ 
-static ossl_inline unsigned int constant_time_lt(unsigned int a, 
-                                                 unsigned int b); 
-/* Convenience method for getting an 8-bit mask. */ 
-static ossl_inline unsigned char constant_time_lt_8(unsigned int a, 
-                                                    unsigned int b); 
-/* Convenience method for uint64_t. */ 
-static ossl_inline uint64_t constant_time_lt_64(uint64_t a, uint64_t b); 
- 
-/* Returns 0xff..f if a >= b and 0 otherwise. */ 
-static ossl_inline unsigned int constant_time_ge(unsigned int a, 
-                                                 unsigned int b); 
-/* Convenience method for getting an 8-bit mask. */ 
-static ossl_inline unsigned char constant_time_ge_8(unsigned int a, 
-                                                    unsigned int b); 
- 
-/* Returns 0xff..f if a == 0 and 0 otherwise. */ 
-static ossl_inline unsigned int constant_time_is_zero(unsigned int a); 
-/* Convenience method for getting an 8-bit mask. */ 
-static ossl_inline unsigned char constant_time_is_zero_8(unsigned int a); 
-/* Convenience method for getting a 32-bit mask. */ 
-static ossl_inline uint32_t constant_time_is_zero_32(uint32_t a); 
- 
-/* Returns 0xff..f if a == b and 0 otherwise. */ 
-static ossl_inline unsigned int constant_time_eq(unsigned int a, 
-                                                 unsigned int b); 
-/* Convenience method for getting an 8-bit mask. */ 
-static ossl_inline unsigned char constant_time_eq_8(unsigned int a, 
-                                                    unsigned int b); 
-/* Signed integers. */ 
-static ossl_inline unsigned int constant_time_eq_int(int a, int b); 
-/* Convenience method for getting an 8-bit mask. */ 
-static ossl_inline unsigned char constant_time_eq_int_8(int a, int b); 
- 
-/*- 
- * Returns (mask & a) | (~mask & b). 
- * 
- * When |mask| is all 1s or all 0s (as returned by the methods above), 
- * the select methods return either |a| (if |mask| is nonzero) or |b| 
- * (if |mask| is zero). 
- */ 
-static ossl_inline unsigned int constant_time_select(unsigned int mask, 
-                                                     unsigned int a, 
-                                                     unsigned int b); 
-/* Convenience method for unsigned chars. */ 
-static ossl_inline unsigned char constant_time_select_8(unsigned char mask, 
-                                                        unsigned char a, 
-                                                        unsigned char b); 
- 
-/* Convenience method for uint32_t. */ 
-static ossl_inline uint32_t constant_time_select_32(uint32_t mask, uint32_t a, 
-                                                    uint32_t b); 
- 
-/* Convenience method for uint64_t. */ 
-static ossl_inline uint64_t constant_time_select_64(uint64_t mask, uint64_t a, 
-                                                    uint64_t b); 
-/* Convenience method for signed integers. */ 
-static ossl_inline int constant_time_select_int(unsigned int mask, int a, 
-                                                int b); 
- 
- 
-static ossl_inline unsigned int constant_time_msb(unsigned int a) 
-{ 
-    return 0 - (a >> (sizeof(a) * 8 - 1)); 
-} 
- 
- 
-static ossl_inline uint32_t constant_time_msb_32(uint32_t a) 
-{ 
-    return 0 - (a >> 31); 
-} 
- 
-static ossl_inline uint64_t constant_time_msb_64(uint64_t a) 
-{ 
-    return 0 - (a >> 63); 
-} 
- 
-static ossl_inline size_t constant_time_msb_s(size_t a) 
-{ 
-    return 0 - (a >> (sizeof(a) * 8 - 1)); 
-} 
- 
-static ossl_inline unsigned int constant_time_lt(unsigned int a, 
-                                                 unsigned int b) 
-{ 
-    return constant_time_msb(a ^ ((a ^ b) | ((a - b) ^ b))); 
-} 
- 
-static ossl_inline size_t constant_time_lt_s(size_t a, size_t b) 
-{ 
-    return constant_time_msb_s(a ^ ((a ^ b) | ((a - b) ^ b))); 
-} 
- 
-static ossl_inline unsigned char constant_time_lt_8(unsigned int a, 
-                                                    unsigned int b) 
-{ 
-    return (unsigned char)constant_time_lt(a, b); 
-} 
- 
-static ossl_inline uint64_t constant_time_lt_64(uint64_t a, uint64_t b) 
-{ 
-    return constant_time_msb_64(a ^ ((a ^ b) | ((a - b) ^ b))); 
-} 
- 
-static ossl_inline unsigned int constant_time_ge(unsigned int a, 
-                                                 unsigned int b) 
-{ 
-    return ~constant_time_lt(a, b); 
-} 
- 
-static ossl_inline size_t constant_time_ge_s(size_t a, size_t b) 
-{ 
-    return ~constant_time_lt_s(a, b); 
-} 
- 
-static ossl_inline unsigned char constant_time_ge_8(unsigned int a, 
-                                                    unsigned int b) 
-{ 
-    return (unsigned char)constant_time_ge(a, b); 
-} 
- 
-static ossl_inline unsigned char constant_time_ge_8_s(size_t a, size_t b) 
-{ 
-    return (unsigned char)constant_time_ge_s(a, b); 
-} 
- 
-static ossl_inline unsigned int constant_time_is_zero(unsigned int a) 
-{ 
-    return constant_time_msb(~a & (a - 1)); 
-} 
- 
-static ossl_inline size_t constant_time_is_zero_s(size_t a) 
-{ 
-    return constant_time_msb_s(~a & (a - 1)); 
-} 
- 
-static ossl_inline unsigned char constant_time_is_zero_8(unsigned int a) 
-{ 
-    return (unsigned char)constant_time_is_zero(a); 
-} 
- 
-static ossl_inline uint32_t constant_time_is_zero_32(uint32_t a) 
-{ 
-    return constant_time_msb_32(~a & (a - 1)); 
-} 
- 
-static ossl_inline unsigned int constant_time_eq(unsigned int a, 
-                                                 unsigned int b) 
-{ 
-    return constant_time_is_zero(a ^ b); 
-} 
- 
-static ossl_inline size_t constant_time_eq_s(size_t a, size_t b) 
-{ 
-    return constant_time_is_zero_s(a ^ b); 
-} 
- 
-static ossl_inline unsigned char constant_time_eq_8(unsigned int a, 
-                                                    unsigned int b) 
-{ 
-    return (unsigned char)constant_time_eq(a, b); 
-} 
- 
-static ossl_inline unsigned char constant_time_eq_8_s(size_t a, size_t b) 
-{ 
-    return (unsigned char)constant_time_eq_s(a, b); 
-} 
- 
-static ossl_inline unsigned int constant_time_eq_int(int a, int b) 
-{ 
-    return constant_time_eq((unsigned)(a), (unsigned)(b)); 
-} 
- 
-static ossl_inline unsigned char constant_time_eq_int_8(int a, int b) 
-{ 
-    return constant_time_eq_8((unsigned)(a), (unsigned)(b)); 
-} 
- 
-/* 
- * Returns the value unmodified, but avoids optimizations. 
- * The barriers prevent the compiler from narrowing down the 
- * possible value range of the mask and ~mask in the select 
- * statements, which avoids the recognition of the select 
- * and turning it into a conditional load or branch. 
- */ 
-static ossl_inline unsigned int value_barrier(unsigned int a) 
-{ 
-#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__) 
-    unsigned int r; 
-    __asm__("" : "=r"(r) : "0"(a)); 
-#else 
-    volatile unsigned int r = a; 
-#endif 
-    return r; 
-} 
- 
-/* Convenience method for uint32_t. */ 
-static ossl_inline uint32_t value_barrier_32(uint32_t a) 
-{ 
-#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__) 
-    uint32_t r; 
-    __asm__("" : "=r"(r) : "0"(a)); 
-#else 
-    volatile uint32_t r = a; 
-#endif 
-    return r; 
-} 
- 
-/* Convenience method for uint64_t. */ 
-static ossl_inline uint64_t value_barrier_64(uint64_t a) 
-{ 
-#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__) 
-    uint64_t r; 
-    __asm__("" : "=r"(r) : "0"(a)); 
-#else 
-    volatile uint64_t r = a; 
-#endif 
-    return r; 
-} 
- 
-/* Convenience method for size_t. */ 
-static ossl_inline size_t value_barrier_s(size_t a) 
-{ 
-#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__) 
-    size_t r; 
-    __asm__("" : "=r"(r) : "0"(a)); 
-#else 
-    volatile size_t r = a; 
-#endif 
-    return r; 
-} 
- 
-static ossl_inline unsigned int constant_time_select(unsigned int mask, 
-                                                     unsigned int a, 
-                                                     unsigned int b) 
-{ 
-    return (value_barrier(mask) & a) | (value_barrier(~mask) & b); 
-} 
- 
-static ossl_inline size_t constant_time_select_s(size_t mask, 
-                                                 size_t a, 
-                                                 size_t b) 
-{ 
-    return (value_barrier_s(mask) & a) | (value_barrier_s(~mask) & b); 
-} 
- 
-static ossl_inline unsigned char constant_time_select_8(unsigned char mask, 
-                                                        unsigned char a, 
-                                                        unsigned char b) 
-{ 
-    return (unsigned char)constant_time_select(mask, a, b); 
-} 
- 
-static ossl_inline int constant_time_select_int(unsigned int mask, int a, 
-                                                int b) 
-{ 
-    return (int)constant_time_select(mask, (unsigned)(a), (unsigned)(b)); 
-} 
- 
-static ossl_inline int constant_time_select_int_s(size_t mask, int a, int b) 
-{ 
-    return (int)constant_time_select((unsigned)mask, (unsigned)(a), 
-                                      (unsigned)(b)); 
-} 
- 
-static ossl_inline uint32_t constant_time_select_32(uint32_t mask, uint32_t a, 
-                                                    uint32_t b) 
-{ 
-    return (value_barrier_32(mask) & a) | (value_barrier_32(~mask) & b); 
-} 
- 
-static ossl_inline uint64_t constant_time_select_64(uint64_t mask, uint64_t a, 
-                                                    uint64_t b) 
-{ 
-    return (value_barrier_64(mask) & a) | (value_barrier_64(~mask) & b); 
-} 
- 
-/* 
- * mask must be 0xFFFFFFFF or 0x00000000. 
- * 
- * if (mask) { 
- *     uint32_t tmp = *a; 
- * 
- *     *a = *b; 
- *     *b = tmp; 
- * } 
- */ 
-static ossl_inline void constant_time_cond_swap_32(uint32_t mask, uint32_t *a, 
-                                                   uint32_t *b) 
-{ 
-    uint32_t xor = *a ^ *b; 
- 
-    xor &= mask; 
-    *a ^= xor; 
-    *b ^= xor; 
-} 
- 
-/* 
- * mask must be 0xFFFFFFFF or 0x00000000. 
- * 
- * if (mask) { 
- *     uint64_t tmp = *a; 
- * 
- *     *a = *b; 
- *     *b = tmp; 
- * } 
- */ 
-static ossl_inline void constant_time_cond_swap_64(uint64_t mask, uint64_t *a, 
-                                                   uint64_t *b) 
-{ 
-    uint64_t xor = *a ^ *b; 
- 
-    xor &= mask; 
-    *a ^= xor; 
-    *b ^= xor; 
-} 
- 
-/* 
- * table is a two dimensional array of bytes. Each row has rowsize elements. 
- * Copies row number idx into out. rowsize and numrows are not considered 
- * private. 
- */ 
-static ossl_inline void constant_time_lookup(void *out, 
-                                             const void *table, 
-                                             size_t rowsize, 
-                                             size_t numrows, 
-                                             size_t idx) 
-{ 
-    size_t i, j; 
-    const unsigned char *tablec = (const unsigned char *)table; 
-    unsigned char *outc = (unsigned char *)out; 
-    unsigned char mask; 
- 
-    memset(out, 0, rowsize); 
- 
-    /* Note idx may underflow - but that is well defined */ 
-    for (i = 0; i < numrows; i++, idx--) { 
-        mask = (unsigned char)constant_time_is_zero_s(idx); 
-        for (j = 0; j < rowsize; j++) 
-            *(outc + j) |= constant_time_select_8(mask, *(tablec++), 0); 
-    } 
-} 
- 
-/* 
- * Expected usage pattern is to unconditionally set error and then 
- * wipe it if there was no actual error. |clear| is 1 or 0. 
- */ 
-void err_clear_last_constant_time(int clear); 
- 
-#endif                          /* OSSL_INTERNAL_CONSTANT_TIME_H */ 
+/*
+ * Copyright 2014-2019 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
+ */
+
+#ifndef OSSL_INTERNAL_CONSTANT_TIME_H
+# define OSSL_INTERNAL_CONSTANT_TIME_H
+
+# include <stdlib.h>
+# include <string.h>
+# include <openssl/e_os2.h>              /* For 'ossl_inline' */
+
+/*-
+ * The boolean methods return a bitmask of all ones (0xff...f) for true
+ * and 0 for false. This is useful for choosing a value based on the result
+ * of a conditional in constant time. For example,
+ *      if (a < b) {
+ *        c = a;
+ *      } else {
+ *        c = b;
+ *      }
+ * can be written as
+ *      unsigned int lt = constant_time_lt(a, b);
+ *      c = constant_time_select(lt, a, b);
+ */
+
+/* Returns the given value with the MSB copied to all the other bits. */
+static ossl_inline unsigned int constant_time_msb(unsigned int a);
+/* Convenience method for uint32_t. */
+static ossl_inline uint32_t constant_time_msb_32(uint32_t a);
+/* Convenience method for uint64_t. */
+static ossl_inline uint64_t constant_time_msb_64(uint64_t a);
+
+/* Returns 0xff..f if a < b and 0 otherwise. */
+static ossl_inline unsigned int constant_time_lt(unsigned int a,
+                                                 unsigned int b);
+/* Convenience method for getting an 8-bit mask. */
+static ossl_inline unsigned char constant_time_lt_8(unsigned int a,
+                                                    unsigned int b);
+/* Convenience method for uint64_t. */
+static ossl_inline uint64_t constant_time_lt_64(uint64_t a, uint64_t b);
+
+/* Returns 0xff..f if a >= b and 0 otherwise. */
+static ossl_inline unsigned int constant_time_ge(unsigned int a,
+                                                 unsigned int b);
+/* Convenience method for getting an 8-bit mask. */
+static ossl_inline unsigned char constant_time_ge_8(unsigned int a,
+                                                    unsigned int b);
+
+/* Returns 0xff..f if a == 0 and 0 otherwise. */
+static ossl_inline unsigned int constant_time_is_zero(unsigned int a);
+/* Convenience method for getting an 8-bit mask. */
+static ossl_inline unsigned char constant_time_is_zero_8(unsigned int a);
+/* Convenience method for getting a 32-bit mask. */
+static ossl_inline uint32_t constant_time_is_zero_32(uint32_t a);
+
+/* Returns 0xff..f if a == b and 0 otherwise. */
+static ossl_inline unsigned int constant_time_eq(unsigned int a,
+                                                 unsigned int b);
+/* Convenience method for getting an 8-bit mask. */
+static ossl_inline unsigned char constant_time_eq_8(unsigned int a,
+                                                    unsigned int b);
+/* Signed integers. */
+static ossl_inline unsigned int constant_time_eq_int(int a, int b);
+/* Convenience method for getting an 8-bit mask. */
+static ossl_inline unsigned char constant_time_eq_int_8(int a, int b);
+
+/*-
+ * Returns (mask & a) | (~mask & b).
+ *
+ * When |mask| is all 1s or all 0s (as returned by the methods above),
+ * the select methods return either |a| (if |mask| is nonzero) or |b|
+ * (if |mask| is zero).
+ */
+static ossl_inline unsigned int constant_time_select(unsigned int mask,
+                                                     unsigned int a,
+                                                     unsigned int b);
+/* Convenience method for unsigned chars. */
+static ossl_inline unsigned char constant_time_select_8(unsigned char mask,
+                                                        unsigned char a,
+                                                        unsigned char b);
+
+/* Convenience method for uint32_t. */
+static ossl_inline uint32_t constant_time_select_32(uint32_t mask, uint32_t a,
+                                                    uint32_t b);
+
+/* Convenience method for uint64_t. */
+static ossl_inline uint64_t constant_time_select_64(uint64_t mask, uint64_t a,
+                                                    uint64_t b);
+/* Convenience method for signed integers. */
+static ossl_inline int constant_time_select_int(unsigned int mask, int a,
+                                                int b);
+
+
+static ossl_inline unsigned int constant_time_msb(unsigned int a)
+{
+    return 0 - (a >> (sizeof(a) * 8 - 1));
+}
+
+
+static ossl_inline uint32_t constant_time_msb_32(uint32_t a)
+{
+    return 0 - (a >> 31);
+}
+
+static ossl_inline uint64_t constant_time_msb_64(uint64_t a)
+{
+    return 0 - (a >> 63);
+}
+
+static ossl_inline size_t constant_time_msb_s(size_t a)
+{
+    return 0 - (a >> (sizeof(a) * 8 - 1));
+}
+
+static ossl_inline unsigned int constant_time_lt(unsigned int a,
+                                                 unsigned int b)
+{
+    return constant_time_msb(a ^ ((a ^ b) | ((a - b) ^ b)));
+}
+
+static ossl_inline size_t constant_time_lt_s(size_t a, size_t b)
+{
+    return constant_time_msb_s(a ^ ((a ^ b) | ((a - b) ^ b)));
+}
+
+static ossl_inline unsigned char constant_time_lt_8(unsigned int a,
+                                                    unsigned int b)
+{
+    return (unsigned char)constant_time_lt(a, b);
+}
+
+static ossl_inline uint64_t constant_time_lt_64(uint64_t a, uint64_t b)
+{
+    return constant_time_msb_64(a ^ ((a ^ b) | ((a - b) ^ b)));
+}
+
+static ossl_inline unsigned int constant_time_ge(unsigned int a,
+                                                 unsigned int b)
+{
+    return ~constant_time_lt(a, b);
+}
+
+static ossl_inline size_t constant_time_ge_s(size_t a, size_t b)
+{
+    return ~constant_time_lt_s(a, b);
+}
+
+static ossl_inline unsigned char constant_time_ge_8(unsigned int a,
+                                                    unsigned int b)
+{
+    return (unsigned char)constant_time_ge(a, b);
+}
+
+static ossl_inline unsigned char constant_time_ge_8_s(size_t a, size_t b)
+{
+    return (unsigned char)constant_time_ge_s(a, b);
+}
+
+static ossl_inline unsigned int constant_time_is_zero(unsigned int a)
+{
+    return constant_time_msb(~a & (a - 1));
+}
+
+static ossl_inline size_t constant_time_is_zero_s(size_t a)
+{
+    return constant_time_msb_s(~a & (a - 1));
+}
+
+static ossl_inline unsigned char constant_time_is_zero_8(unsigned int a)
+{
+    return (unsigned char)constant_time_is_zero(a);
+}
+
+static ossl_inline uint32_t constant_time_is_zero_32(uint32_t a)
+{
+    return constant_time_msb_32(~a & (a - 1));
+}
+
+static ossl_inline unsigned int constant_time_eq(unsigned int a,
+                                                 unsigned int b)
+{
+    return constant_time_is_zero(a ^ b);
+}
+
+static ossl_inline size_t constant_time_eq_s(size_t a, size_t b)
+{
+    return constant_time_is_zero_s(a ^ b);
+}
+
+static ossl_inline unsigned char constant_time_eq_8(unsigned int a,
+                                                    unsigned int b)
+{
+    return (unsigned char)constant_time_eq(a, b);
+}
+
+static ossl_inline unsigned char constant_time_eq_8_s(size_t a, size_t b)
+{
+    return (unsigned char)constant_time_eq_s(a, b);
+}
+
+static ossl_inline unsigned int constant_time_eq_int(int a, int b)
+{
+    return constant_time_eq((unsigned)(a), (unsigned)(b));
+}
+
+static ossl_inline unsigned char constant_time_eq_int_8(int a, int b)
+{
+    return constant_time_eq_8((unsigned)(a), (unsigned)(b));
+}
+
+/*
+ * Returns the value unmodified, but avoids optimizations.
+ * The barriers prevent the compiler from narrowing down the
+ * possible value range of the mask and ~mask in the select
+ * statements, which avoids the recognition of the select
+ * and turning it into a conditional load or branch.
+ */
+static ossl_inline unsigned int value_barrier(unsigned int a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    unsigned int r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile unsigned int r = a;
+#endif
+    return r;
+}
+
+/* Convenience method for uint32_t. */
+static ossl_inline uint32_t value_barrier_32(uint32_t a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    uint32_t r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile uint32_t r = a;
+#endif
+    return r;
+}
+
+/* Convenience method for uint64_t. */
+static ossl_inline uint64_t value_barrier_64(uint64_t a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    uint64_t r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile uint64_t r = a;
+#endif
+    return r;
+}
+
+/* Convenience method for size_t. */
+static ossl_inline size_t value_barrier_s(size_t a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    size_t r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile size_t r = a;
+#endif
+    return r;
+}
+
+static ossl_inline unsigned int constant_time_select(unsigned int mask,
+                                                     unsigned int a,
+                                                     unsigned int b)
+{
+    return (value_barrier(mask) & a) | (value_barrier(~mask) & b);
+}
+
+static ossl_inline size_t constant_time_select_s(size_t mask,
+                                                 size_t a,
+                                                 size_t b)
+{
+    return (value_barrier_s(mask) & a) | (value_barrier_s(~mask) & b);
+}
+
+static ossl_inline unsigned char constant_time_select_8(unsigned char mask,
+                                                        unsigned char a,
+                                                        unsigned char b)
+{
+    return (unsigned char)constant_time_select(mask, a, b);
+}
+
+static ossl_inline int constant_time_select_int(unsigned int mask, int a,
+                                                int b)
+{
+    return (int)constant_time_select(mask, (unsigned)(a), (unsigned)(b));
+}
+
+static ossl_inline int constant_time_select_int_s(size_t mask, int a, int b)
+{
+    return (int)constant_time_select((unsigned)mask, (unsigned)(a),
+                                      (unsigned)(b));
+}
+
+static ossl_inline uint32_t constant_time_select_32(uint32_t mask, uint32_t a,
+                                                    uint32_t b)
+{
+    return (value_barrier_32(mask) & a) | (value_barrier_32(~mask) & b);
+}
+
+static ossl_inline uint64_t constant_time_select_64(uint64_t mask, uint64_t a,
+                                                    uint64_t b)
+{
+    return (value_barrier_64(mask) & a) | (value_barrier_64(~mask) & b);
+}
+
+/*
+ * mask must be 0xFFFFFFFF or 0x00000000.
+ *
+ * if (mask) {
+ *     uint32_t tmp = *a;
+ *
+ *     *a = *b;
+ *     *b = tmp;
+ * }
+ */
+static ossl_inline void constant_time_cond_swap_32(uint32_t mask, uint32_t *a,
+                                                   uint32_t *b)
+{
+    uint32_t xor = *a ^ *b;
+
+    xor &= mask;
+    *a ^= xor;
+    *b ^= xor;
+}
+
+/*
+ * mask must be 0xFFFFFFFF or 0x00000000.
+ *
+ * if (mask) {
+ *     uint64_t tmp = *a;
+ *
+ *     *a = *b;
+ *     *b = tmp;
+ * }
+ */
+static ossl_inline void constant_time_cond_swap_64(uint64_t mask, uint64_t *a,
+                                                   uint64_t *b)
+{
+    uint64_t xor = *a ^ *b;
+
+    xor &= mask;
+    *a ^= xor;
+    *b ^= xor;
+}
+
+/*
+ * table is a two dimensional array of bytes. Each row has rowsize elements.
+ * Copies row number idx into out. rowsize and numrows are not considered
+ * private.
+ */
+static ossl_inline void constant_time_lookup(void *out,
+                                             const void *table,
+                                             size_t rowsize,
+                                             size_t numrows,
+                                             size_t idx)
+{
+    size_t i, j;
+    const unsigned char *tablec = (const unsigned char *)table;
+    unsigned char *outc = (unsigned char *)out;
+    unsigned char mask;
+
+    memset(out, 0, rowsize);
+
+    /* Note idx may underflow - but that is well defined */
+    for (i = 0; i < numrows; i++, idx--) {
+        mask = (unsigned char)constant_time_is_zero_s(idx);
+        for (j = 0; j < rowsize; j++)
+            *(outc + j) |= constant_time_select_8(mask, *(tablec++), 0);
+    }
+}
+
+/*
+ * Expected usage pattern is to unconditionally set error and then
+ * wipe it if there was no actual error. |clear| is 1 or 0.
+ */
+void err_clear_last_constant_time(int clear);
+
+#endif                          /* OSSL_INTERNAL_CONSTANT_TIME_H */
diff --git a/contrib/libs/openssl/include/internal/cryptlib.h b/contrib/libs/openssl/include/internal/cryptlib.h
index 31028e67da..6e7291ae41 100644
--- a/contrib/libs/openssl/include/internal/cryptlib.h
+++ b/contrib/libs/openssl/include/internal/cryptlib.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_CRYPTLIB_H 
-# define OSSL_INTERNAL_CRYPTLIB_H 
+#ifndef OSSL_INTERNAL_CRYPTLIB_H
+# define OSSL_INTERNAL_CRYPTLIB_H
 
 # include <stdlib.h>
 # include <string.h>
diff --git a/contrib/libs/openssl/include/internal/dane.h b/contrib/libs/openssl/include/internal/dane.h
index 09c7acdf1c..7a39bd7d7d 100644
--- a/contrib/libs/openssl/include/internal/dane.h
+++ b/contrib/libs/openssl/include/internal/dane.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_DANE_H 
-#define OSSL_INTERNAL_DANE_H 
+#ifndef OSSL_INTERNAL_DANE_H
+#define OSSL_INTERNAL_DANE_H
 
 #include <openssl/safestack.h>
 
@@ -100,4 +100,4 @@ struct ssl_dane_st {
 #define DANETLS_HAS_DANE_TA(dane) ((dane)&&((dane)->umask & DANETLS_DANE_TA_MASK))
 #define DANETLS_HAS_DANE_EE(dane) ((dane)&&((dane)->umask & DANETLS_DANE_EE_MASK))
 
-#endif /* OSSL_INTERNAL_DANE_H */ 
+#endif /* OSSL_INTERNAL_DANE_H */
diff --git a/contrib/libs/openssl/include/internal/dso.h b/contrib/libs/openssl/include/internal/dso.h
index cf805a842f..c57c0c4075 100644
--- a/contrib/libs/openssl/include/internal/dso.h
+++ b/contrib/libs/openssl/include/internal/dso.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_DSO_H 
-# define OSSL_INTERNAL_DSO_H 
+#ifndef OSSL_INTERNAL_DSO_H
+# define OSSL_INTERNAL_DSO_H
 
 # include <openssl/crypto.h>
 # include "internal/dsoerr.h"
diff --git a/contrib/libs/openssl/include/internal/dsoerr.h b/contrib/libs/openssl/include/internal/dsoerr.h
index 2a71950dc9..94d642a22d 100644
--- a/contrib/libs/openssl/include/internal/dsoerr.h
+++ b/contrib/libs/openssl/include/internal/dsoerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_DSOERR_H 
-# define OSSL_INTERNAL_DSOERR_H 
+#ifndef OSSL_INTERNAL_DSOERR_H
+# define OSSL_INTERNAL_DSOERR_H
 
 # ifndef HEADER_SYMHACKS_H
 #  include <openssl/symhacks.h>
diff --git a/contrib/libs/openssl/include/internal/err.h b/contrib/libs/openssl/include/internal/err.h
index 95b1db46a7..88dde70591 100644
--- a/contrib/libs/openssl/include/internal/err.h
+++ b/contrib/libs/openssl/include/internal/err.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_ERR_H 
-# define OSSL_INTERNAL_ERR_H 
+#ifndef OSSL_INTERNAL_ERR_H
+# define OSSL_INTERNAL_ERR_H
 
 void err_free_strings_int(void);
 
diff --git a/contrib/libs/openssl/include/internal/nelem.h b/contrib/libs/openssl/include/internal/nelem.h
index c3633680cb..699ef88ee5 100644
--- a/contrib/libs/openssl/include/internal/nelem.h
+++ b/contrib/libs/openssl/include/internal/nelem.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_NELEM_H 
-# define OSSL_INTERNAL_NELEM_H 
+#ifndef OSSL_INTERNAL_NELEM_H
+# define OSSL_INTERNAL_NELEM_H
 
 # define OSSL_NELEM(x)    (sizeof(x)/sizeof((x)[0]))
 #endif
diff --git a/contrib/libs/openssl/include/internal/numbers.h b/contrib/libs/openssl/include/internal/numbers.h
index c9efcc8dba..f5ade5226e 100644
--- a/contrib/libs/openssl/include/internal/numbers.h
+++ b/contrib/libs/openssl/include/internal/numbers.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_NUMBERS_H 
-# define OSSL_INTERNAL_NUMBERS_H 
+#ifndef OSSL_INTERNAL_NUMBERS_H
+# define OSSL_INTERNAL_NUMBERS_H
 
 # include <limits.h>
 
diff --git a/contrib/libs/openssl/include/internal/o_dir.h b/contrib/libs/openssl/include/internal/o_dir.h
index bd10056053..dafc8dd2e7 100644
--- a/contrib/libs/openssl/include/internal/o_dir.h
+++ b/contrib/libs/openssl/include/internal/o_dir.h
@@ -36,8 +36,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef OSSL_INTERNAL_O_DIR_H 
-# define OSSL_INTERNAL_O_DIR_H 
+#ifndef OSSL_INTERNAL_O_DIR_H
+# define OSSL_INTERNAL_O_DIR_H
 
 typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX;
 
diff --git a/contrib/libs/openssl/include/internal/o_str.h b/contrib/libs/openssl/include/internal/o_str.h
index d5f1479a06..15c12e820d 100644
--- a/contrib/libs/openssl/include/internal/o_str.h
+++ b/contrib/libs/openssl/include/internal/o_str.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_O_STR_H 
-# define OSSL_INTERNAL_O_STR_H 
+#ifndef OSSL_INTERNAL_O_STR_H
+# define OSSL_INTERNAL_O_STR_H
 
 # include <stddef.h>            /* to get size_t */
 
diff --git a/contrib/libs/openssl/include/internal/refcount.h b/contrib/libs/openssl/include/internal/refcount.h
index 81f9c7e2a2..8fb536eadc 100644
--- a/contrib/libs/openssl/include/internal/refcount.h
+++ b/contrib/libs/openssl/include/internal/refcount.h
@@ -6,8 +6,8 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
-#ifndef OSSL_INTERNAL_REFCOUNT_H 
-# define OSSL_INTERNAL_REFCOUNT_H 
+#ifndef OSSL_INTERNAL_REFCOUNT_H
+# define OSSL_INTERNAL_REFCOUNT_H
 
 /* Used to checking reference counts, most while doing perl5 stuff :-) */
 # if defined(OPENSSL_NO_STDIO)
diff --git a/contrib/libs/openssl/include/internal/sockets.h b/contrib/libs/openssl/include/internal/sockets.h
index 704a0ffece..39186efef2 100644
--- a/contrib/libs/openssl/include/internal/sockets.h
+++ b/contrib/libs/openssl/include/internal/sockets.h
@@ -8,8 +8,8 @@
  */
 
 
-#ifndef OSSL_INTERNAL_SOCKETS_H 
-# define OSSL_INTERNAL_SOCKETS_H 
+#ifndef OSSL_INTERNAL_SOCKETS_H
+# define OSSL_INTERNAL_SOCKETS_H
 
 # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
 #  define NO_SYS_PARAM_H
diff --git a/contrib/libs/openssl/include/internal/sslconf.h b/contrib/libs/openssl/include/internal/sslconf.h
index ab55af16a8..92c8941d02 100644
--- a/contrib/libs/openssl/include/internal/sslconf.h
+++ b/contrib/libs/openssl/include/internal/sslconf.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_INTERNAL_SSLCONF_H 
-# define OSSL_INTERNAL_SSLCONF_H 
+#ifndef OSSL_INTERNAL_SSLCONF_H
+# define OSSL_INTERNAL_SSLCONF_H
 
 typedef struct ssl_conf_cmd_st SSL_CONF_CMD;