libsodium: update to 1.0.19

1 files changed, 220 insertions, 220 deletions

diff --git a/libs/libsodium/src/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h b/libs/libsodium/src/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h
index c827f89834..ae79f637e0 100644
--- a/libs/libsodium/src/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h
+++ b/libs/libsodium/src/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h
@@ -1,220 +1,220 @@
-/*
-   poly1305 implementation using 64 bit * 64 bit = 128 bit multiplication
-   and 128 bit addition
-*/
-
-#include "private/common.h"
-
-#define MUL(out, x, y) out = ((uint128_t) x * y)
-#define ADD(out, in) out += in
-#define ADDLO(out, in) out += in
-#define SHR(in, shift) (unsigned long long) (in >> (shift))
-#define LO(in) (unsigned long long) (in)
-
-#if defined(_MSC_VER)
-# define POLY1305_NOINLINE __declspec(noinline)
-#elif defined(__clang__) || defined(__GNUC__)
-# define POLY1305_NOINLINE __attribute__((noinline))
-#else
-# define POLY1305_NOINLINE
-#endif
-
-#define poly1305_block_size 16
-
-/* 17 + sizeof(unsigned long long) + 8*sizeof(unsigned long long) */
-typedef struct poly1305_state_internal_t {
-    unsigned long long r[3];
-    unsigned long long h[3];
-    unsigned long long pad[2];
-    unsigned long long leftover;
-    unsigned char      buffer[poly1305_block_size];
-    unsigned char      final;
-} poly1305_state_internal_t;
-
-static void
-poly1305_init(poly1305_state_internal_t *st, const unsigned char key[32])
-{
-    unsigned long long t0, t1;
-
-    /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
-    t0 = LOAD64_LE(&key[0]);
-    t1 = LOAD64_LE(&key[8]);
-
-    /* wiped after finalization */
-    st->r[0] = (t0) &0xffc0fffffff;
-    st->r[1] = ((t0 >> 44) | (t1 << 20)) & 0xfffffc0ffff;
-    st->r[2] = ((t1 >> 24)) & 0x00ffffffc0f;
-
-    /* h = 0 */
-    st->h[0] = 0;
-    st->h[1] = 0;
-    st->h[2] = 0;
-
-    /* save pad for later */
-    st->pad[0] = LOAD64_LE(&key[16]);
-    st->pad[1] = LOAD64_LE(&key[24]);
-
-    st->leftover = 0;
-    st->final    = 0;
-}
-
-static void
-poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m,
-                unsigned long long bytes)
-{
-    const unsigned long long hibit =
-        (st->final) ? 0ULL : (1ULL << 40); /* 1 << 128 */
-    unsigned long long r0, r1, r2;
-    unsigned long long s1, s2;
-    unsigned long long h0, h1, h2;
-    unsigned long long c;
-    uint128_t          d0, d1, d2, d;
-
-    r0 = st->r[0];
-    r1 = st->r[1];
-    r2 = st->r[2];
-
-    h0 = st->h[0];
-    h1 = st->h[1];
-    h2 = st->h[2];
-
-    s1 = r1 * (5 << 2);
-    s2 = r2 * (5 << 2);
-
-    while (bytes >= poly1305_block_size) {
-        unsigned long long t0, t1;
-
-        /* h += m[i] */
-        t0 = LOAD64_LE(&m[0]);
-        t1 = LOAD64_LE(&m[8]);
-
-        h0 += ((t0) &0xfffffffffff);
-        h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff);
-        h2 += (((t1 >> 24)) & 0x3ffffffffff) | hibit;
-
-        /* h *= r */
-        MUL(d0, h0, r0);
-        MUL(d, h1, s2);
-        ADD(d0, d);
-        MUL(d, h2, s1);
-        ADD(d0, d);
-        MUL(d1, h0, r1);
-        MUL(d, h1, r0);
-        ADD(d1, d);
-        MUL(d, h2, s2);
-        ADD(d1, d);
-        MUL(d2, h0, r2);
-        MUL(d, h1, r1);
-        ADD(d2, d);
-        MUL(d, h2, r0);
-        ADD(d2, d);
-
-        /* (partial) h %= p */
-        c  = SHR(d0, 44);
-        h0 = LO(d0) & 0xfffffffffff;
-        ADDLO(d1, c);
-        c  = SHR(d1, 44);
-        h1 = LO(d1) & 0xfffffffffff;
-        ADDLO(d2, c);
-        c  = SHR(d2, 42);
-        h2 = LO(d2) & 0x3ffffffffff;
-        h0 += c * 5;
-        c  = (h0 >> 44);
-        h0 = h0 & 0xfffffffffff;
-        h1 += c;
-
-        m += poly1305_block_size;
-        bytes -= poly1305_block_size;
-    }
-
-    st->h[0] = h0;
-    st->h[1] = h1;
-    st->h[2] = h2;
-}
-
-static POLY1305_NOINLINE void
-poly1305_finish(poly1305_state_internal_t *st, unsigned char mac[16])
-{
-    unsigned long long h0, h1, h2, c;
-    unsigned long long g0, g1, g2;
-    unsigned long long t0, t1;
-
-    /* process the remaining block */
-    if (st->leftover) {
-        unsigned long long i = st->leftover;
-
-        st->buffer[i] = 1;
-
-        for (i = i + 1; i < poly1305_block_size; i++) {
-            st->buffer[i] = 0;
-        }
-        st->final = 1;
-        poly1305_blocks(st, st->buffer, poly1305_block_size);
-    }
-
-    /* fully carry h */
-    h0 = st->h[0];
-    h1 = st->h[1];
-    h2 = st->h[2];
-
-    c = (h1 >> 44);
-    h1 &= 0xfffffffffff;
-    h2 += c;
-    c = (h2 >> 42);
-    h2 &= 0x3ffffffffff;
-    h0 += c * 5;
-    c = (h0 >> 44);
-    h0 &= 0xfffffffffff;
-    h1 += c;
-    c = (h1 >> 44);
-    h1 &= 0xfffffffffff;
-    h2 += c;
-    c = (h2 >> 42);
-    h2 &= 0x3ffffffffff;
-    h0 += c * 5;
-    c = (h0 >> 44);
-    h0 &= 0xfffffffffff;
-    h1 += c;
-
-    /* compute h + -p */
-    g0 = h0 + 5;
-    c  = (g0 >> 44);
-    g0 &= 0xfffffffffff;
-    g1 = h1 + c;
-    c  = (g1 >> 44);
-    g1 &= 0xfffffffffff;
-    g2 = h2 + c - (1ULL << 42);
-
-    /* select h if h < p, or h + -p if h >= p */
-    c = (g2 >> ((sizeof(unsigned long long) * 8) - 1)) - 1;
-    g0 &= c;
-    g1 &= c;
-    g2 &= c;
-    c  = ~c;
-    h0 = (h0 & c) | g0;
-    h1 = (h1 & c) | g1;
-    h2 = (h2 & c) | g2;
-
-    /* h = (h + pad) */
-    t0 = st->pad[0];
-    t1 = st->pad[1];
-
-    h0 += ((t0) &0xfffffffffff);
-    c = (h0 >> 44);
-    h0 &= 0xfffffffffff;
-    h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff) + c;
-    c = (h1 >> 44);
-    h1 &= 0xfffffffffff;
-    h2 += (((t1 >> 24)) & 0x3ffffffffff) + c;
-    h2 &= 0x3ffffffffff;
-
-    /* mac = h % (2^128) */
-    h0 = ((h0) | (h1 << 44));
-    h1 = ((h1 >> 20) | (h2 << 24));
-
-    STORE64_LE(&mac[0], h0);
-    STORE64_LE(&mac[8], h1);
-
-    /* zero out the state */
-    sodium_memzero((void *) st, sizeof *st);
-}
+/*

+   poly1305 implementation using 64 bit * 64 bit = 128 bit multiplication

+   and 128 bit addition

+*/

+

+#include "private/common.h"

+

+#define MUL(out, x, y) out = ((uint128_t) x * y)

+#define ADD(out, in) out += in

+#define ADDLO(out, in) out += in

+#define SHR(in, shift) (unsigned long long) (in >> (shift))

+#define LO(in) (unsigned long long) (in)

+

+#if defined(_MSC_VER)

+# define POLY1305_NOINLINE __declspec(noinline)

+#elif defined(__clang__) || defined(__GNUC__)

+# define POLY1305_NOINLINE __attribute__((noinline))

+#else

+# define POLY1305_NOINLINE

+#endif

+

+#define poly1305_block_size 16

+

+/* 17 + sizeof(unsigned long long) + 8*sizeof(unsigned long long) */

+typedef struct poly1305_state_internal_t {

+    unsigned long long r[3];

+    unsigned long long h[3];

+    unsigned long long pad[2];

+    unsigned long long leftover;

+    unsigned char      buffer[poly1305_block_size];

+    unsigned char      final;

+} poly1305_state_internal_t;

+

+static void

+poly1305_init(poly1305_state_internal_t *st, const unsigned char key[32])

+{

+    unsigned long long t0, t1;

+

+    /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */

+    t0 = LOAD64_LE(&key[0]);

+    t1 = LOAD64_LE(&key[8]);

+

+    /* wiped after finalization */

+    st->r[0] = (t0) &0xffc0fffffff;

+    st->r[1] = ((t0 >> 44) | (t1 << 20)) & 0xfffffc0ffff;

+    st->r[2] = ((t1 >> 24)) & 0x00ffffffc0f;

+

+    /* h = 0 */

+    st->h[0] = 0;

+    st->h[1] = 0;

+    st->h[2] = 0;

+

+    /* save pad for later */

+    st->pad[0] = LOAD64_LE(&key[16]);

+    st->pad[1] = LOAD64_LE(&key[24]);

+

+    st->leftover = 0;

+    st->final    = 0;

+}

+

+static void

+poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m,

+                unsigned long long bytes)

+{

+    const unsigned long long hibit =

+        (st->final) ? 0ULL : (1ULL << 40); /* 1 << 128 */

+    unsigned long long r0, r1, r2;

+    unsigned long long s1, s2;

+    unsigned long long h0, h1, h2;

+    unsigned long long c;

+    uint128_t          d0, d1, d2, d;

+

+    r0 = st->r[0];

+    r1 = st->r[1];

+    r2 = st->r[2];

+

+    h0 = st->h[0];

+    h1 = st->h[1];

+    h2 = st->h[2];

+

+    s1 = r1 * (5 << 2);

+    s2 = r2 * (5 << 2);

+

+    while (bytes >= poly1305_block_size) {

+        unsigned long long t0, t1;

+

+        /* h += m[i] */

+        t0 = LOAD64_LE(&m[0]);

+        t1 = LOAD64_LE(&m[8]);

+

+        h0 += ((t0) &0xfffffffffff);

+        h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff);

+        h2 += (((t1 >> 24)) & 0x3ffffffffff) | hibit;

+

+        /* h *= r */

+        MUL(d0, h0, r0);

+        MUL(d, h1, s2);

+        ADD(d0, d);

+        MUL(d, h2, s1);

+        ADD(d0, d);

+        MUL(d1, h0, r1);

+        MUL(d, h1, r0);

+        ADD(d1, d);

+        MUL(d, h2, s2);

+        ADD(d1, d);

+        MUL(d2, h0, r2);

+        MUL(d, h1, r1);

+        ADD(d2, d);

+        MUL(d, h2, r0);

+        ADD(d2, d);

+

+        /* (partial) h %= p */

+        c  = SHR(d0, 44);

+        h0 = LO(d0) & 0xfffffffffff;

+        ADDLO(d1, c);

+        c  = SHR(d1, 44);

+        h1 = LO(d1) & 0xfffffffffff;

+        ADDLO(d2, c);

+        c  = SHR(d2, 42);

+        h2 = LO(d2) & 0x3ffffffffff;

+        h0 += c * 5;

+        c  = (h0 >> 44);

+        h0 = h0 & 0xfffffffffff;

+        h1 += c;

+

+        m += poly1305_block_size;

+        bytes -= poly1305_block_size;

+    }

+

+    st->h[0] = h0;

+    st->h[1] = h1;

+    st->h[2] = h2;

+}

+

+static POLY1305_NOINLINE void

+poly1305_finish(poly1305_state_internal_t *st, unsigned char mac[16])

+{

+    unsigned long long h0, h1, h2, c;

+    unsigned long long g0, g1, g2;

+    unsigned long long t0, t1;

+

+    /* process the remaining block */

+    if (st->leftover) {

+        unsigned long long i = st->leftover;

+

+        st->buffer[i] = 1;

+

+        for (i = i + 1; i < poly1305_block_size; i++) {

+            st->buffer[i] = 0;

+        }

+        st->final = 1;

+        poly1305_blocks(st, st->buffer, poly1305_block_size);

+    }

+

+    /* fully carry h */

+    h0 = st->h[0];

+    h1 = st->h[1];

+    h2 = st->h[2];

+

+    c = (h1 >> 44);

+    h1 &= 0xfffffffffff;

+    h2 += c;

+    c = (h2 >> 42);

+    h2 &= 0x3ffffffffff;

+    h0 += c * 5;

+    c = (h0 >> 44);

+    h0 &= 0xfffffffffff;

+    h1 += c;

+    c = (h1 >> 44);

+    h1 &= 0xfffffffffff;

+    h2 += c;

+    c = (h2 >> 42);

+    h2 &= 0x3ffffffffff;

+    h0 += c * 5;

+    c = (h0 >> 44);

+    h0 &= 0xfffffffffff;

+    h1 += c;

+

+    /* compute h + -p */

+    g0 = h0 + 5;

+    c  = (g0 >> 44);

+    g0 &= 0xfffffffffff;

+    g1 = h1 + c;

+    c  = (g1 >> 44);

+    g1 &= 0xfffffffffff;

+    g2 = h2 + c - (1ULL << 42);

+

+    /* select h if h < p, or h + -p if h >= p */

+    c = (g2 >> ((sizeof(unsigned long long) * 8) - 1)) - 1;

+    g0 &= c;

+    g1 &= c;

+    g2 &= c;

+    c  = ~c;

+    h0 = (h0 & c) | g0;

+    h1 = (h1 & c) | g1;

+    h2 = (h2 & c) | g2;

+

+    /* h = (h + pad) */

+    t0 = st->pad[0];

+    t1 = st->pad[1];

+

+    h0 += ((t0) &0xfffffffffff);

+    c = (h0 >> 44);

+    h0 &= 0xfffffffffff;

+    h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff) + c;

+    c = (h1 >> 44);

+    h1 &= 0xfffffffffff;

+    h2 += (((t1 >> 24)) & 0x3ffffffffff) + c;

+    h2 &= 0x3ffffffffff;

+

+    /* mac = h % (2^128) */

+    h0 = ((h0) | (h1 << 44));

+    h1 = ((h1 >> 20) | (h2 << 24));

+

+    STORE64_LE(&mac[0], h0);

+    STORE64_LE(&mac[8], h1);

+

+    /* zero out the state */

+    sodium_memzero((void *) st, sizeof *st);

+}