rbnacl-libsodium 1.0.11 → 1.0.13

data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/ref/{stream_chacha20_ref.c → chacha20_ref.c}

@@ -9,51 +9,48 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils.h"
 #include "crypto_stream_chacha20.h"
-#include "stream_chacha20_ref.h"
-#include "../stream_chacha20.h"
 #include "private/common.h"
+#include "utils.h"
+
+#include "../stream_chacha20.h"
+#include "chacha20_ref.h"
 
 struct chacha_ctx {
     uint32_t input[16];
 };
 
-typedef uint8_t  u8;
-typedef uint32_t u32;
-
 typedef struct chacha_ctx chacha_ctx;
 
-#define U8C(v) (v##U)
 #define U32C(v) (v##U)
 
-#define U8V(v) ((u8)(v) & U8C(0xFF))
-#define U32V(v) ((u32)(v) & U32C(0xFFFFFFFF))
-
-#define ROTL32(v, n) \
-  (U32V((v) << (n)) | ((v) >> (32 - (n))))
+#define U32V(v) ((uint32_t)(v) &U32C(0xFFFFFFFF))
 
-#define ROTATE(v,c) (ROTL32(v,c))
-#define XOR(v,w) ((v) ^ (w))
-#define PLUS(v,w) (U32V((v) + (w)))
-#define PLUSONE(v) (PLUS((v),1))
+#define ROTATE(v, c) (ROTL32(v, c))
+#define XOR(v, w) ((v) ^ (w))
+#define PLUS(v, w) (U32V((v) + (w)))
+#define PLUSONE(v) (PLUS((v), 1))
 
-#define QUARTERROUND(a,b,c,d) \
-  a = PLUS(a,b); d = ROTATE(XOR(d,a),16); \
-  c = PLUS(c,d); b = ROTATE(XOR(b,c),12); \
-  a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \
-  c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
+#define QUARTERROUND(a, b, c, d) \
+    a = PLUS(a, b);              \
+    d = ROTATE(XOR(d, a), 16);   \
+    c = PLUS(c, d);              \
+    b = ROTATE(XOR(b, c), 12);   \
+    a = PLUS(a, b);              \
+    d = ROTATE(XOR(d, a), 8);    \
+    c = PLUS(c, d);              \
+    b = ROTATE(XOR(b, c), 7);
 
 static void
-chacha_keysetup(chacha_ctx *ctx, const u8 *k)
+chacha_keysetup(chacha_ctx *ctx, const uint8_t *k)
 {
     ctx->input[0]  = U32C(0x61707865);
     ctx->input[1]  = U32C(0x3320646e);
     ctx->input[2]  = U32C(0x79622d32);
     ctx->input[3]  = U32C(0x6b206574);
-    ctx->input[4]  = LOAD32_LE(k +  0);
-    ctx->input[5]  = LOAD32_LE(k +  4);
-    ctx->input[6]  = LOAD32_LE(k +  8);
+    ctx->input[4]  = LOAD32_LE(k + 0);
+    ctx->input[5]  = LOAD32_LE(k + 4);
+    ctx->input[6]  = LOAD32_LE(k + 8);
     ctx->input[7]  = LOAD32_LE(k + 12);
     ctx->input[8]  = LOAD32_LE(k + 16);
     ctx->input[9]  = LOAD32_LE(k + 20);
@@ -62,7 +59,7 @@ chacha_keysetup(chacha_ctx *ctx, const u8 *k)
 }
 
 static void
-chacha_ivsetup(chacha_ctx *ctx, const u8 *iv, const u8 *counter)
+chacha_ivsetup(chacha_ctx *ctx, const uint8_t *iv, const uint8_t *counter)
 {
     ctx->input[12] = counter == NULL ? 0 : LOAD32_LE(counter + 0);
     ctx->input[13] = counter == NULL ? 0 : LOAD32_LE(counter + 4);
@@ -71,7 +68,7 @@ chacha_ivsetup(chacha_ctx *ctx, const u8 *iv, const u8 *counter)
 }
 
 static void
-chacha_ietf_ivsetup(chacha_ctx *ctx, const u8 *iv, const u8 *counter)
+chacha_ietf_ivsetup(chacha_ctx *ctx, const uint8_t *iv, const uint8_t *counter)
 {
     ctx->input[12] = counter == NULL ? 0 : LOAD32_LE(counter);
     ctx->input[13] = LOAD32_LE(iv + 0);
@@ -80,12 +77,15 @@ chacha_ietf_ivsetup(chacha_ctx *ctx, const u8 *iv, const u8 *counter)
 }
 
 static void
-chacha_encrypt_bytes(chacha_ctx *ctx, const u8 *m, u8 *c, unsigned long long bytes)
+chacha20_encrypt_bytes(chacha_ctx *ctx, const uint8_t *m, uint8_t *c,
+                       unsigned long long bytes)
 {
-    u32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
-    u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
-    u8 *ctarget = NULL;
-    u8 tmp[64];
+    uint32_t x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14,
+        x15;
+    uint32_t j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14,
+        j15;
+    uint8_t     *ctarget = NULL;
+    uint8_t      tmp[64];
     unsigned int i;
 
     if (!bytes) {
@@ -94,16 +94,16 @@ chacha_encrypt_bytes(chacha_ctx *ctx, const u8 *m, u8 *c, unsigned long long byt
     if (bytes > 64ULL * (1ULL << 32) - 64ULL) {
         abort();
     }
-    j0 = ctx->input[0];
-    j1 = ctx->input[1];
-    j2 = ctx->input[2];
-    j3 = ctx->input[3];
-    j4 = ctx->input[4];
-    j5 = ctx->input[5];
-    j6 = ctx->input[6];
-    j7 = ctx->input[7];
-    j8 = ctx->input[8];
-    j9 = ctx->input[9];
+    j0  = ctx->input[0];
+    j1  = ctx->input[1];
+    j2  = ctx->input[2];
+    j3  = ctx->input[3];
+    j4  = ctx->input[4];
+    j5  = ctx->input[5];
+    j6  = ctx->input[6];
+    j7  = ctx->input[7];
+    j8  = ctx->input[8];
+    j9  = ctx->input[9];
     j10 = ctx->input[10];
     j11 = ctx->input[11];
     j12 = ctx->input[12];
@@ -117,20 +117,20 @@ chacha_encrypt_bytes(chacha_ctx *ctx, const u8 *m, u8 *c, unsigned long long byt
             for (i = 0; i < bytes; ++i) {
                 tmp[i] = m[i];
             }
-            m = tmp;
+            m       = tmp;
             ctarget = c;
-            c = tmp;
+            c       = tmp;
         }
-        x0 = j0;
-        x1 = j1;
-        x2 = j2;
-        x3 = j3;
-        x4 = j4;
-        x5 = j5;
-        x6 = j6;
-        x7 = j7;
-        x8 = j8;
-        x9 = j9;
+        x0  = j0;
+        x1  = j1;
+        x2  = j2;
+        x3  = j3;
+        x4  = j4;
+        x5  = j5;
+        x6  = j6;
+        x7  = j7;
+        x8  = j8;
+        x9  = j9;
         x10 = j10;
         x11 = j11;
         x12 = j12;
@@ -147,16 +147,16 @@ chacha_encrypt_bytes(chacha_ctx *ctx, const u8 *m, u8 *c, unsigned long long byt
             QUARTERROUND(x2, x7, x8, x13)
             QUARTERROUND(x3, x4, x9, x14)
         }
-        x0 = PLUS(x0, j0);
-        x1 = PLUS(x1, j1);
-        x2 = PLUS(x2, j2);
-        x3 = PLUS(x3, j3);
-        x4 = PLUS(x4, j4);
-        x5 = PLUS(x5, j5);
-        x6 = PLUS(x6, j6);
-        x7 = PLUS(x7, j7);
-        x8 = PLUS(x8, j8);
-        x9 = PLUS(x9, j9);
+        x0  = PLUS(x0, j0);
+        x1  = PLUS(x1, j1);
+        x2  = PLUS(x2, j2);
+        x3  = PLUS(x3, j3);
+        x4  = PLUS(x4, j4);
+        x5  = PLUS(x5, j5);
+        x6  = PLUS(x6, j6);
+        x7  = PLUS(x7, j7);
+        x8  = PLUS(x8, j8);
+        x9  = PLUS(x9, j9);
         x10 = PLUS(x10, j10);
         x11 = PLUS(x11, j11);
         x12 = PLUS(x12, j12);
@@ -164,16 +164,16 @@ chacha_encrypt_bytes(chacha_ctx *ctx, const u8 *m, u8 *c, unsigned long long byt
         x14 = PLUS(x14, j14);
         x15 = PLUS(x15, j15);
 
-        x0 = XOR(x0, LOAD32_LE(m + 0));
-        x1 = XOR(x1, LOAD32_LE(m + 4));
-        x2 = XOR(x2, LOAD32_LE(m + 8));
-        x3 = XOR(x3, LOAD32_LE(m + 12));
-        x4 = XOR(x4, LOAD32_LE(m + 16));
-        x5 = XOR(x5, LOAD32_LE(m + 20));
-        x6 = XOR(x6, LOAD32_LE(m + 24));
-        x7 = XOR(x7, LOAD32_LE(m + 28));
-        x8 = XOR(x8, LOAD32_LE(m + 32));
-        x9 = XOR(x9, LOAD32_LE(m + 36));
+        x0  = XOR(x0, LOAD32_LE(m + 0));
+        x1  = XOR(x1, LOAD32_LE(m + 4));
+        x2  = XOR(x2, LOAD32_LE(m + 8));
+        x3  = XOR(x3, LOAD32_LE(m + 12));
+        x4  = XOR(x4, LOAD32_LE(m + 16));
+        x5  = XOR(x5, LOAD32_LE(m + 20));
+        x6  = XOR(x6, LOAD32_LE(m + 24));
+        x7  = XOR(x7, LOAD32_LE(m + 28));
+        x8  = XOR(x8, LOAD32_LE(m + 32));
+        x9  = XOR(x9, LOAD32_LE(m + 36));
         x10 = XOR(x10, LOAD32_LE(m + 40));
         x11 = XOR(x11, LOAD32_LE(m + 44));
         x12 = XOR(x12, LOAD32_LE(m + 48));
@@ -213,6 +213,7 @@ chacha_encrypt_bytes(chacha_ctx *ctx, const u8 *m, u8 *c, unsigned long long byt
             }
             ctx->input[12] = j12;
             ctx->input[13] = j13;
+
             return;
         }
         bytes -= 64;
@@ -222,19 +223,19 @@ chacha_encrypt_bytes(chacha_ctx *ctx, const u8 *m, u8 *c, unsigned long long byt
 }
 
 static int
-stream_ref(unsigned char *c, unsigned long long clen,
-           const unsigned char *n, const unsigned char *k)
+stream_ref(unsigned char *c, unsigned long long clen, const unsigned char *n,
+           const unsigned char *k)
 {
     struct chacha_ctx ctx;
 
     if (!clen) {
         return 0;
     }
-    (void) sizeof(int[crypto_stream_chacha20_KEYBYTES == 256 / 8 ? 1 : -1]);
+    COMPILER_ASSERT(crypto_stream_chacha20_KEYBYTES == 256 / 8);
     chacha_keysetup(&ctx, k);
     chacha_ivsetup(&ctx, n, NULL);
     memset(c, 0, clen);
-    chacha_encrypt_bytes(&ctx, c, c, clen);
+    chacha20_encrypt_bytes(&ctx, c, c, clen);
     sodium_memzero(&ctx, sizeof ctx);
 
     return 0;
@@ -249,11 +250,11 @@ stream_ietf_ref(unsigned char *c, unsigned long long clen,
     if (!clen) {
         return 0;
     }
-    (void) sizeof(int[crypto_stream_chacha20_KEYBYTES == 256 / 8 ? 1 : -1]);
+    COMPILER_ASSERT(crypto_stream_chacha20_KEYBYTES == 256 / 8);
     chacha_keysetup(&ctx, k);
     chacha_ietf_ivsetup(&ctx, n, NULL);
     memset(c, 0, clen);
-    chacha_encrypt_bytes(&ctx, c, c, clen);
+    chacha20_encrypt_bytes(&ctx, c, c, clen);
     sodium_memzero(&ctx, sizeof ctx);
 
     return 0;
@@ -261,8 +262,7 @@ stream_ietf_ref(unsigned char *c, unsigned long long clen,
 
 static int
 stream_ref_xor_ic(unsigned char *c, const unsigned char *m,
-                  unsigned long long mlen,
-                  const unsigned char *n, uint64_t ic,
+                  unsigned long long mlen, const unsigned char *n, uint64_t ic,
                   const unsigned char *k)
 {
     struct chacha_ctx ctx;
@@ -274,12 +274,12 @@ stream_ref_xor_ic(unsigned char *c, const unsigned char *m,
         return 0;
     }
     ic_high = U32V(ic >> 32);
-    ic_low = U32V(ic);
+    ic_low  = U32V(ic);
     STORE32_LE(&ic_bytes[0], ic_low);
     STORE32_LE(&ic_bytes[4], ic_high);
     chacha_keysetup(&ctx, k);
     chacha_ivsetup(&ctx, n, ic_bytes);
-    chacha_encrypt_bytes(&ctx, m, c, mlen);
+    chacha20_encrypt_bytes(&ctx, m, c, mlen);
     sodium_memzero(&ctx, sizeof ctx);
 
     return 0;
@@ -287,9 +287,8 @@ stream_ref_xor_ic(unsigned char *c, const unsigned char *m,
 
 static int
 stream_ietf_ref_xor_ic(unsigned char *c, const unsigned char *m,
-                       unsigned long long mlen,
-                       const unsigned char *n, uint32_t ic,
-                       const unsigned char *k)
+                       unsigned long long mlen, const unsigned char *n,
+                       uint32_t ic, const unsigned char *k)
 {
     struct chacha_ctx ctx;
     uint8_t           ic_bytes[4];
@@ -300,16 +299,16 @@ stream_ietf_ref_xor_ic(unsigned char *c, const unsigned char *m,
     STORE32_LE(ic_bytes, ic);
     chacha_keysetup(&ctx, k);
     chacha_ietf_ivsetup(&ctx, n, ic_bytes);
-    chacha_encrypt_bytes(&ctx, m, c, mlen);
+    chacha20_encrypt_bytes(&ctx, m, c, mlen);
     sodium_memzero(&ctx, sizeof ctx);
 
     return 0;
 }
 
 struct crypto_stream_chacha20_implementation
-crypto_stream_chacha20_ref_implementation = {
-    SODIUM_C99(.stream =) stream_ref,
-    SODIUM_C99(.stream_ietf =) stream_ietf_ref,
-    SODIUM_C99(.stream_xor_ic =) stream_ref_xor_ic,
-    SODIUM_C99(.stream_ietf_xor_ic =) stream_ietf_ref_xor_ic
-};
+    crypto_stream_chacha20_ref_implementation = {
+        SODIUM_C99(.stream =) stream_ref,
+        SODIUM_C99(.stream_ietf =) stream_ietf_ref,
+        SODIUM_C99(.stream_xor_ic =) stream_ref_xor_ic,
+        SODIUM_C99(.stream_ietf_xor_ic =) stream_ietf_ref_xor_ic
+    };

data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.h

@@ -0,0 +1,8 @@
+
+#include <stdint.h>
+
+#include "../stream_chacha20.h"
+#include "crypto_stream_chacha20.h"
+
+extern struct crypto_stream_chacha20_implementation
+    crypto_stream_chacha20_ref_implementation;

data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c

@@ -1,9 +1,16 @@
 #include "crypto_stream_chacha20.h"
-#include "stream_chacha20.h"
+#include "private/common.h"
+#include "randombytes.h"
 #include "runtime.h"
-#include "ref/stream_chacha20_ref.h"
-#if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(__GNUC__))
-# include "vec/stream_chacha20_vec.h"
+#include "stream_chacha20.h"
+
+#include "ref/chacha20_ref.h"
+#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
+    defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
+# include "dolbeau/chacha20_dolbeau-avx2.h"
+#endif
+#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
+# include "dolbeau/chacha20_dolbeau-ssse3.h"
 #endif
 
 static const crypto_stream_chacha20_implementation *implementation =
@@ -19,9 +26,14 @@ crypto_stream_chacha20_noncebytes(void) {
     return crypto_stream_chacha20_NONCEBYTES;
 }
 
+size_t
+crypto_stream_chacha20_ietf_keybytes(void) {
+    return crypto_stream_chacha20_ietf_KEYBYTES;
+}
+
 size_t
 crypto_stream_chacha20_ietf_noncebytes(void) {
-    return crypto_stream_chacha20_IETF_NONCEBYTES;
+    return crypto_stream_chacha20_ietf_NONCEBYTES;
 }
 
 int
@@ -72,13 +84,33 @@ crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
     return implementation->stream_ietf_xor_ic(c, m, mlen, n, 0U, k);
 }
 
+void
+crypto_stream_chacha20_ietf_keygen(unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES])
+{
+    randombytes_buf(k, crypto_stream_chacha20_ietf_KEYBYTES);
+}
+
+void
+crypto_stream_chacha20_keygen(unsigned char k[crypto_stream_chacha20_KEYBYTES])
+{
+    randombytes_buf(k, crypto_stream_chacha20_KEYBYTES);
+}
+
 int
 _crypto_stream_chacha20_pick_best_implementation(void)
 {
     implementation = &crypto_stream_chacha20_ref_implementation;
-#if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(__GNUC__))
+#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
+    defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
+    if (sodium_runtime_has_avx2()) {
+        implementation = &crypto_stream_chacha20_dolbeau_avx2_implementation;
+        return 0;
+    }
+#endif
+#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
     if (sodium_runtime_has_ssse3()) {
-        implementation = &crypto_stream_chacha20_vec_implementation;
+        implementation = &crypto_stream_chacha20_dolbeau_ssse3_implementation;
+        return 0;
     }
 #endif
     return 0;

data/vendor/libsodium/src/libsodium/crypto_stream/crypto_stream.c

@@ -1,5 +1,6 @@
 
 #include "crypto_stream.h"
+#include "randombytes.h"
 
 size_t
 crypto_stream_keybytes(void)
@@ -34,3 +35,9 @@ crypto_stream_xor(unsigned char *c, const unsigned char *m,
 {
     return crypto_stream_xsalsa20_xor(c, m, mlen, n, k);
 }
+
+void
+crypto_stream_keygen(unsigned char k[crypto_stream_KEYBYTES])
+{
+    randombytes_buf(k, crypto_stream_KEYBYTES);
+}

data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c

@@ -0,0 +1,120 @@
+/*
+version 20140420
+D. J. Bernstein
+Public domain.
+*/
+
+#include <stdint.h>
+
+#include "crypto_core_salsa20.h"
+#include "crypto_stream_salsa20.h"
+#include "utils.h"
+
+#include "../stream_salsa20.h"
+#include "salsa20_ref.h"
+
+#ifndef HAVE_AMD64_ASM
+
+static int
+stream_ref(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_salsa20(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_salsa20(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;
+}
+
+static int
+stream_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                  unsigned long long mlen, const unsigned char *n, uint64_t ic,
+                  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] = (unsigned char) (ic & 0xff);
+        ic >>= 8;
+    }
+    while (mlen >= 64) {
+        crypto_core_salsa20(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_salsa20(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;
+}
+
+struct crypto_stream_salsa20_implementation
+    crypto_stream_salsa20_ref_implementation = {
+        SODIUM_C99(.stream =) stream_ref,
+        SODIUM_C99(.stream_xor_ic =) stream_ref_xor_ic,
+    };
+
+#endif