libsodium: update to 1.0.19

2 files changed, 132 insertions, 132 deletions

diff --git a/libs/libsodium/src/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c b/libs/libsodium/src/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c
index bfdfeedba3..239becfc9e 100644
--- a/libs/libsodium/src/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c
+++ b/libs/libsodium/src/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c
@@ -1,106 +1,106 @@
-/*
-version 20140420
-D. J. Bernstein
-Public domain.
-*/
-
-#include <stdint.h>
-
-#include "crypto_core_salsa2012.h"
-#include "crypto_stream_salsa2012.h"
-#include "utils.h"
-
-int
-crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
-                        const unsigned char *n, const unsigned char *k)
-{
-    unsigned char in[16];
-    unsigned char block[64];
-    unsigned char kcopy[32];
-    unsigned int  i;
-    unsigned int  u;
-
-    if (!clen) {
-        return 0;
-    }
-    for (i = 0; i < 32; ++i) {
-        kcopy[i] = k[i];
-    }
-    for (i = 0; i < 8; ++i) {
-        in[i] = n[i];
-    }
-    for (i = 8; i < 16; ++i) {
-        in[i] = 0;
-    }
-    while (clen >= 64) {
-        crypto_core_salsa2012(c, in, kcopy, NULL);
-        u = 1;
-        for (i = 8; i < 16; ++i) {
-            u += (unsigned int)in[i];
-            in[i] = u;
-            u >>= 8;
-        }
-        clen -= 64;
-        c += 64;
-    }
-    if (clen) {
-        crypto_core_salsa2012(block, in, kcopy, NULL);
-        for (i = 0; i < (unsigned int)clen; ++i) {
-            c[i] = block[i];
-        }
-    }
-    sodium_memzero(block, sizeof block);
-    sodium_memzero(kcopy, sizeof kcopy);
-
-    return 0;
-}
-
-int
-crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,
-                            unsigned long long mlen, const unsigned char *n,
-                            const unsigned char *k)
-{
-    unsigned char in[16];
-    unsigned char block[64];
-    unsigned char kcopy[32];
-    unsigned int  i;
-    unsigned int  u;
-
-    if (!mlen) {
-        return 0;
-    }
-    for (i = 0; i < 32; ++i) {
-        kcopy[i] = k[i];
-    }
-    for (i = 0; i < 8; ++i) {
-        in[i] = n[i];
-    }
-    for (i = 8; i < 16; ++i) {
-        in[i] = 0;
-    }
-    while (mlen >= 64) {
-        crypto_core_salsa2012(block, in, kcopy, NULL);
-        for (i = 0; i < 64; ++i) {
-            c[i] = m[i] ^ block[i];
-        }
-        u = 1;
-        for (i = 8; i < 16; ++i) {
-            u += (unsigned int)in[i];
-            in[i] = u;
-            u >>= 8;
-        }
-        mlen -= 64;
-        c += 64;
-        m += 64;
-    }
-    if (mlen) {
-        crypto_core_salsa2012(block, in, kcopy, NULL);
-        for (i = 0; i < (unsigned int)mlen; ++i) {
-            c[i] = m[i] ^ block[i];
-        }
-    }
-    sodium_memzero(block, sizeof block);
-    sodium_memzero(kcopy, sizeof kcopy);
-
-    return 0;
-}
+/*

+version 20140420

+D. J. Bernstein

+Public domain.

+*/

+

+#include <stdint.h>

+

+#include "crypto_core_salsa2012.h"

+#include "crypto_stream_salsa2012.h"

+#include "utils.h"

+

+int

+crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,

+                        const unsigned char *n, const unsigned char *k)

+{

+    unsigned char in[16];

+    unsigned char block[64];

+    unsigned char kcopy[32];

+    unsigned int  i;

+    unsigned int  u;

+

+    if (!clen) {

+        return 0;

+    }

+    for (i = 0; i < 32; ++i) {

+        kcopy[i] = k[i];

+    }

+    for (i = 0; i < 8; ++i) {

+        in[i] = n[i];

+    }

+    for (i = 8; i < 16; ++i) {

+        in[i] = 0;

+    }

+    while (clen >= 64) {

+        crypto_core_salsa2012(c, in, kcopy, NULL);

+        u = 1;

+        for (i = 8; i < 16; ++i) {

+            u += (unsigned int)in[i];

+            in[i] = u;

+            u >>= 8;

+        }

+        clen -= 64;

+        c += 64;

+    }

+    if (clen) {

+        crypto_core_salsa2012(block, in, kcopy, NULL);

+        for (i = 0; i < (unsigned int)clen; ++i) {

+            c[i] = block[i];

+        }

+    }

+    sodium_memzero(block, sizeof block);

+    sodium_memzero(kcopy, sizeof kcopy);

+

+    return 0;

+}

+

+int

+crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,

+                            unsigned long long mlen, const unsigned char *n,

+                            const unsigned char *k)

+{

+    unsigned char in[16];

+    unsigned char block[64];

+    unsigned char kcopy[32];

+    unsigned int  i;

+    unsigned int  u;

+

+    if (!mlen) {

+        return 0;

+    }

+    for (i = 0; i < 32; ++i) {

+        kcopy[i] = k[i];

+    }

+    for (i = 0; i < 8; ++i) {

+        in[i] = n[i];

+    }

+    for (i = 8; i < 16; ++i) {

+        in[i] = 0;

+    }

+    while (mlen >= 64) {

+        crypto_core_salsa2012(block, in, kcopy, NULL);

+        for (i = 0; i < 64; ++i) {

+            c[i] = m[i] ^ block[i];

+        }

+        u = 1;

+        for (i = 8; i < 16; ++i) {

+            u += (unsigned int)in[i];

+            in[i] = u;

+            u >>= 8;

+        }

+        mlen -= 64;

+        c += 64;

+        m += 64;

+    }

+    if (mlen) {

+        crypto_core_salsa2012(block, in, kcopy, NULL);

+        for (i = 0; i < (unsigned int)mlen; ++i) {

+            c[i] = m[i] ^ block[i];

+        }

+    }

+    sodium_memzero(block, sizeof block);

+    sodium_memzero(kcopy, sizeof kcopy);

+

+    return 0;

+}

diff --git a/libs/libsodium/src/crypto_stream/salsa2012/stream_salsa2012.c b/libs/libsodium/src/crypto_stream/salsa2012/stream_salsa2012.c
index d0cc0f68ee..506ec57624 100644
--- a/libs/libsodium/src/crypto_stream/salsa2012/stream_salsa2012.c
+++ b/libs/libsodium/src/crypto_stream/salsa2012/stream_salsa2012.c
@@ -1,26 +1,26 @@
-#include "crypto_stream_salsa2012.h"
-#include "randombytes.h"
-
-size_t
-crypto_stream_salsa2012_keybytes(void)
-{
-    return crypto_stream_salsa2012_KEYBYTES;
-}
-
-size_t
-crypto_stream_salsa2012_noncebytes(void)
-{
-    return crypto_stream_salsa2012_NONCEBYTES;
-}
-
-size_t
-crypto_stream_salsa2012_messagebytes_max(void)
-{
-    return crypto_stream_salsa2012_MESSAGEBYTES_MAX;
-}
-
-void
-crypto_stream_salsa2012_keygen(unsigned char k[crypto_stream_salsa2012_KEYBYTES])
-{
-    randombytes_buf(k, crypto_stream_salsa2012_KEYBYTES);
-}
+#include "crypto_stream_salsa2012.h"

+#include "randombytes.h"

+

+size_t

+crypto_stream_salsa2012_keybytes(void)

+{

+    return crypto_stream_salsa2012_KEYBYTES;

+}

+

+size_t

+crypto_stream_salsa2012_noncebytes(void)

+{

+    return crypto_stream_salsa2012_NONCEBYTES;

+}

+

+size_t

+crypto_stream_salsa2012_messagebytes_max(void)

+{

+    return crypto_stream_salsa2012_MESSAGEBYTES_MAX;

+}

+

+void

+crypto_stream_salsa2012_keygen(unsigned char k[crypto_stream_salsa2012_KEYBYTES])

+{

+    randombytes_buf(k, crypto_stream_salsa2012_KEYBYTES);

+}