rbnacl-libsodium 0.4.5 → 0.5.0

data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c

@@ -1,3 +1,6 @@
+
+#include <string.h>
+
 #include "api.h"
 #include "crypto_hash_sha512.h"
 #include "ge.h"
@@ -9,11 +12,13 @@ int crypto_sign(
   const unsigned char *sk
 )
 {
+  unsigned char pk[32];
   unsigned char az[64];
-  unsigned char r[64];
+  unsigned char nonce[64];
   unsigned char hram[64];
   ge_p3 R;
-  unsigned long long i;
+
+  memmove(pk,sk + 32,32);
 
   crypto_hash_sha512(az,sk,32);
   az[0] &= 248;
@@ -21,18 +26,18 @@ int crypto_sign(
   az[31] |= 64;
 
   *smlen = mlen + 64;
-  for (i = 0;i < mlen;++i) sm[64 + i] = m[i];
-  for (i = 0;i < 32;++i) sm[32 + i] = az[32 + i];
-  crypto_hash_sha512(r,sm + 32,mlen + 32);
-  for (i = 0;i < 32;++i) sm[32 + i] = sk[32 + i];
+  memmove(sm + 64,m,mlen);
+  memmove(sm + 32,az + 32,32);
+  crypto_hash_sha512(nonce,sm + 32,mlen + 32);
+  memmove(sm + 32,pk,32);
 
-  sc_reduce(r);
-  ge_scalarmult_base(&R,r);
+  sc_reduce(nonce);
+  ge_scalarmult_base(&R,nonce);
   ge_p3_tobytes(sm,&R);
 
   crypto_hash_sha512(hram,sm,mlen + 64);
   sc_reduce(hram);
-  sc_muladd(sm + 32,hram,az,r);
+  sc_muladd(sm + 32,hram,az,nonce);
 
   return 0;
 }

data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519_api.c

@@ -19,8 +19,3 @@ size_t
 crypto_sign_ed25519_secretkeybytes(void) {
     return crypto_sign_ed25519_SECRETKEYBYTES;
 }
-
-const char *
-crypto_sign_ed25519_primitive(void) {
-    return "ed25519";
-}

data/vendor/libsodium/src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h

@@ -7,7 +7,6 @@
 #define crypto_sign_BYTES crypto_sign_edwards25519sha512batch_BYTES
 #define crypto_sign_PUBLICKEYBYTES crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES
 #define crypto_sign_SECRETKEYBYTES crypto_sign_edwards25519sha512batch_SECRETKEYBYTES
-#define crypto_sign_PRIMITIVE "edwards25519sha512batch"
 #define crypto_sign_IMPLEMENTATION crypto_sign_edwards25519sha512batch_IMPLEMENTATION
 #define crypto_sign_VERSION crypto_sign_edwards25519sha512batch_VERSION
 

data/vendor/libsodium/src/libsodium/crypto_sign/edwards25519sha512batch/sign_edwards25519sha512batch_api.c

@@ -14,8 +14,3 @@ size_t
 crypto_sign_edwards25519sha512batch_secretkeybytes(void) {
     return crypto_sign_edwards25519sha512batch_SECRETKEYBYTES;
 }
-
-const char *
-crypto_sign_edwards25519sha512batch_primitive(void) {
-    return "edwards25519sha512batch";
-}

data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c

@@ -7,7 +7,7 @@
 #include "common.h"
 #include "consts.h"
 
-int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const unsigned char *noncep, const unsigned char *c)
+int crypto_stream_afternm(unsigned char *out, unsigned long long len, const unsigned char *nonce, const unsigned char *c)
 {
 
   int128 xmm0;
@@ -38,7 +38,7 @@ int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const uns
   uint32 tmp;
 
   /* Copy nonce on the stack */
-  copy2(&nonce_stack, (const int128 *) (noncep + 0));
+  copy2(&nonce_stack, (const int128 *) (nonce + 0));
   np = (unsigned char *)&nonce_stack;
 
     enc_block:
@@ -92,17 +92,17 @@ int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const uns
     tmp += 8;
     store32_bigendian(np + 12, tmp);
 
-    *(int128 *) (outp + 0) = xmm8;
-    *(int128 *) (outp + 16) = xmm9;
-    *(int128 *) (outp + 32) = xmm12;
-    *(int128 *) (outp + 48) = xmm14;
-    *(int128 *) (outp + 64) = xmm11;
-    *(int128 *) (outp + 80) = xmm15;
-    *(int128 *) (outp + 96) = xmm10;
-    *(int128 *) (outp + 112) = xmm13;
+    *(int128 *) (out + 0) = xmm8;
+    *(int128 *) (out + 16) = xmm9;
+    *(int128 *) (out + 32) = xmm12;
+    *(int128 *) (out + 48) = xmm14;
+    *(int128 *) (out + 64) = xmm11;
+    *(int128 *) (out + 80) = xmm15;
+    *(int128 *) (out + 96) = xmm10;
+    *(int128 *) (out + 112) = xmm13;
 
     len -= 128;
-    outp += 128;
+    out += 128;
 
     goto enc_block;
 
@@ -130,10 +130,10 @@ int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const uns
     if(lensav == 0) goto end;
 
     b = blp[0]; /* clang false positive */
-    *(unsigned char *)(outp + 0) = b;
+    *(unsigned char *)(out + 0) = b;
 
     blp += 1;
-    outp +=1;
+    out +=1;
     lensav -= 1;
 
     goto bytes;
@@ -144,14 +144,14 @@ int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const uns
     tmp += 8;
     store32_bigendian(np + 12, tmp);
 
-    *(int128 *) (outp + 0) = xmm8;
-    *(int128 *) (outp + 16) = xmm9;
-    *(int128 *) (outp + 32) = xmm12;
-    *(int128 *) (outp + 48) = xmm14;
-    *(int128 *) (outp + 64) = xmm11;
-    *(int128 *) (outp + 80) = xmm15;
-    *(int128 *) (outp + 96) = xmm10;
-    *(int128 *) (outp + 112) = xmm13;
+    *(int128 *) (out + 0) = xmm8;
+    *(int128 *) (out + 16) = xmm9;
+    *(int128 *) (out + 32) = xmm12;
+    *(int128 *) (out + 48) = xmm14;
+    *(int128 *) (out + 64) = xmm11;
+    *(int128 *) (out + 80) = xmm15;
+    *(int128 *) (out + 96) = xmm10;
+    *(int128 *) (out + 112) = xmm13;
 
     end:
     return 0;

data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/api.h

@@ -9,6 +9,5 @@
 #define crypto_stream_KEYBYTES crypto_stream_aes128ctr_KEYBYTES
 #define crypto_stream_NONCEBYTES crypto_stream_aes128ctr_NONCEBYTES
 #define crypto_stream_BEFORENMBYTES crypto_stream_aes128ctr_BEFORENMBYTES
-#define crypto_stream_PRIMITIVE "aes128ctr"
 #define crypto_stream_IMPLEMENTATION crypto_stream_aes128ctr_IMPLEMENTATION
 #define crypto_stream_VERSION crypto_stream_aes128ctr_VERSION

data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/int128.h

@@ -3,6 +3,12 @@
 
 #include "common.h"
 
+#ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
+#endif
+
 typedef struct{
   unsigned long long a;
   unsigned long long b;

data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c

@@ -8,7 +8,7 @@
 #include "common.h"
 #include "consts.h"
 
-int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, unsigned long long len, const unsigned char *noncep, const unsigned char *c)
+int crypto_stream_xor_afternm(unsigned char *out, const unsigned char *in, unsigned long long len, const unsigned char *nonce, const unsigned char *c)
 {
 
   int128 xmm0;
@@ -39,7 +39,7 @@ int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, uns
   uint32 tmp;
 
   /* Copy nonce on the stack */
-  copy2(&nonce_stack, (const int128 *) (noncep + 0));
+  copy2(&nonce_stack, (const int128 *) (nonce + 0));
   np = (unsigned char *)&nonce_stack;
 
     enc_block:
@@ -93,27 +93,27 @@ int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, uns
     tmp += 8;
     store32_bigendian(np + 12, tmp);
 
-    xor2(&xmm8, (const int128 *)(inp + 0));
-    xor2(&xmm9, (const int128 *)(inp + 16));
-    xor2(&xmm12, (const int128 *)(inp + 32));
-    xor2(&xmm14, (const int128 *)(inp + 48));
-    xor2(&xmm11, (const int128 *)(inp + 64));
-    xor2(&xmm15, (const int128 *)(inp + 80));
-    xor2(&xmm10, (const int128 *)(inp + 96));
-    xor2(&xmm13, (const int128 *)(inp + 112));
-
-    *(int128 *) (outp + 0) = xmm8;
-    *(int128 *) (outp + 16) = xmm9;
-    *(int128 *) (outp + 32) = xmm12;
-    *(int128 *) (outp + 48) = xmm14;
-    *(int128 *) (outp + 64) = xmm11;
-    *(int128 *) (outp + 80) = xmm15;
-    *(int128 *) (outp + 96) = xmm10;
-    *(int128 *) (outp + 112) = xmm13;
+    xor2(&xmm8, (const int128 *)(in + 0));
+    xor2(&xmm9, (const int128 *)(in + 16));
+    xor2(&xmm12, (const int128 *)(in + 32));
+    xor2(&xmm14, (const int128 *)(in + 48));
+    xor2(&xmm11, (const int128 *)(in + 64));
+    xor2(&xmm15, (const int128 *)(in + 80));
+    xor2(&xmm10, (const int128 *)(in + 96));
+    xor2(&xmm13, (const int128 *)(in + 112));
+
+    *(int128 *) (out + 0) = xmm8;
+    *(int128 *) (out + 16) = xmm9;
+    *(int128 *) (out + 32) = xmm12;
+    *(int128 *) (out + 48) = xmm14;
+    *(int128 *) (out + 64) = xmm11;
+    *(int128 *) (out + 80) = xmm15;
+    *(int128 *) (out + 96) = xmm10;
+    *(int128 *) (out + 112) = xmm13;
 
     len -= 128;
-    inp += 128;
-    outp += 128;
+    in += 128;
+    out += 128;
 
     goto enc_block;
 
@@ -141,12 +141,12 @@ int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, uns
     if(lensav == 0) goto end;
 
     b = blp[0]; /* clang false positive */
-    b ^= *(const unsigned char *)(inp + 0);
-    *(unsigned char *)(outp + 0) = b;
+    b ^= *(const unsigned char *)(in + 0);
+    *(unsigned char *)(out + 0) = b;
 
     blp += 1;
-    inp +=1;
-    outp +=1;
+    in +=1;
+    out +=1;
     lensav -= 1;
 
     goto bytes;
@@ -157,23 +157,23 @@ int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, uns
     tmp += 8;
     store32_bigendian(np + 12, tmp);
 
-    xor2(&xmm8, (const int128 *)(inp + 0));
-    xor2(&xmm9, (const int128 *)(inp + 16));
-    xor2(&xmm12, (const int128 *)(inp + 32));
-    xor2(&xmm14, (const int128 *)(inp + 48));
-    xor2(&xmm11, (const int128 *)(inp + 64));
-    xor2(&xmm15, (const int128 *)(inp + 80));
-    xor2(&xmm10, (const int128 *)(inp + 96));
-    xor2(&xmm13, (const int128 *)(inp + 112));
-
-    *(int128 *) (outp + 0) = xmm8;
-    *(int128 *) (outp + 16) = xmm9;
-    *(int128 *) (outp + 32) = xmm12;
-    *(int128 *) (outp + 48) = xmm14;
-    *(int128 *) (outp + 64) = xmm11;
-    *(int128 *) (outp + 80) = xmm15;
-    *(int128 *) (outp + 96) = xmm10;
-    *(int128 *) (outp + 112) = xmm13;
+    xor2(&xmm8, (const int128 *)(in + 0));
+    xor2(&xmm9, (const int128 *)(in + 16));
+    xor2(&xmm12, (const int128 *)(in + 32));
+    xor2(&xmm14, (const int128 *)(in + 48));
+    xor2(&xmm11, (const int128 *)(in + 64));
+    xor2(&xmm15, (const int128 *)(in + 80));
+    xor2(&xmm10, (const int128 *)(in + 96));
+    xor2(&xmm13, (const int128 *)(in + 112));
+
+    *(int128 *) (out + 0) = xmm8;
+    *(int128 *) (out + 16) = xmm9;
+    *(int128 *) (out + 32) = xmm12;
+    *(int128 *) (out + 48) = xmm14;
+    *(int128 *) (out + 64) = xmm11;
+    *(int128 *) (out + 80) = xmm15;
+    *(int128 *) (out + 96) = xmm10;
+    *(int128 *) (out + 112) = xmm13;
 
     end:
     return 0;

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

@@ -14,8 +14,3 @@ size_t
 crypto_stream_aes128ctr_beforenmbytes(void) {
     return crypto_stream_aes128ctr_BEFORENMBYTES;
 }
-
-const char *
-crypto_stream_aes128ctr_primitive(void) {
-    return "aes128ctr";
-}

data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-be.h

@@ -2,7 +2,7 @@
 #ifndef __AES_TABLE_BE_H__
 #define __AES_TABLE_BE_H__
 
-unsigned int T0[256] = {
+static unsigned int T0[256] = {
     0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d,
     0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554,
     0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d,
@@ -70,7 +70,7 @@ unsigned int T0[256] = {
 };
 
 
-unsigned int T1[256] = {
+static unsigned int T1[256] = {
     0xa5c66363, 0x84f87c7c, 0x99ee7777, 0x8df67b7b,
     0x0dfff2f2, 0xbdd66b6b, 0xb1de6f6f, 0x5491c5c5,
     0x50603030, 0x03020101, 0xa9ce6767, 0x7d562b2b,
@@ -137,7 +137,7 @@ unsigned int T1[256] = {
     0xcb7bb0b0, 0xfca85454, 0xd66dbbbb, 0x3a2c1616
 };
 
-unsigned int T2[256] = {
+static unsigned int T2[256] = {
     0x63a5c663, 0x7c84f87c, 0x7799ee77, 0x7b8df67b,
     0xf20dfff2, 0x6bbdd66b, 0x6fb1de6f, 0xc55491c5,
     0x30506030, 0x01030201, 0x67a9ce67, 0x2b7d562b,
@@ -204,7 +204,7 @@ unsigned int T2[256] = {
     0xb0cb7bb0, 0x54fca854, 0xbbd66dbb, 0x163a2c16
 };
 
-unsigned int T3[256] = {
+static unsigned int T3[256] = {
     0x6363a5c6, 0x7c7c84f8, 0x777799ee, 0x7b7b8df6,
     0xf2f20dff, 0x6b6bbdd6, 0x6f6fb1de, 0xc5c55491,
     0x30305060, 0x01010302, 0x6767a9ce, 0x2b2b7d56,

data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-le.h

@@ -2,7 +2,7 @@
 #ifndef __AES_TABLE_LE_H__
 #define __AES_TABLE_LE_H__
 
-unsigned int T0[256] = {
+static unsigned int T0[256] = {
     0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
     0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
     0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
@@ -70,7 +70,7 @@ unsigned int T0[256] = {
 };
 
 
-unsigned int T1[256] = {
+static unsigned int T1[256] = {
     0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d,
     0xf2f2ff0d, 0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154,
     0x30306050, 0x01010203, 0x6767cea9, 0x2b2b567d,
@@ -137,7 +137,7 @@ unsigned int T1[256] = {
     0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6, 0x16162c3a
 };
 
-unsigned int T2[256] = {
+static unsigned int T2[256] = {
     0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b,
     0xf2ff0df2, 0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5,
     0x30605030, 0x01020301, 0x67cea967, 0x2b567d2b,
@@ -204,7 +204,7 @@ unsigned int T2[256] = {
     0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb, 0x162c3a16
 };
 
-unsigned int T3[256] = {
+static unsigned int T3[256] = {
     0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b,
     0xff0df2f2, 0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5,
     0x60503030, 0x02030101, 0xcea96767, 0x567d2b2b,

data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes256-ctr.c

@@ -27,7 +27,7 @@ ECRYPT_keysetup(ECRYPT_ctx* ctx, const u8* key, u32 keysize, u32 ivsize)
         w[i] =  key[(i << 2)];
         w[i] |= key[(i << 2)+1] << 8;
         w[i] |= key[(i << 2)+2] << 16;
-        w[i] |= key[(i << 2)+3] << 24;
+        w[i] |= (unsigned int) key[(i << 2)+3] << 24;
     }
 
     i = Nk;
@@ -35,7 +35,7 @@ ECRYPT_keysetup(ECRYPT_ctx* ctx, const u8* key, u32 keysize, u32 ivsize)
     while( i < Nb*(Nr+1) ) {
         temp = w[i-1];
 
-        temp = Sbox[ temp & 0xFF] <<  24 ^
+        temp = (unsigned int) Sbox[temp & 0xFF] << 24 ^
             Sbox[(temp >> 8) & 0xFF]  ^
             (Sbox[(temp >> 16) & 0xFF] << 8 ) ^
             (Sbox[(temp >> 24) & 0xFF] << 16) ^
@@ -56,10 +56,10 @@ ECRYPT_keysetup(ECRYPT_ctx* ctx, const u8* key, u32 keysize, u32 ivsize)
         i++;
 
         temp = w[i-1];
-        temp = Sbox[ temp & 0xFF] ^
+        temp = Sbox[temp & 0xFF] ^
             Sbox[(temp >> 8) & 0xFF] << 8 ^
-            (Sbox[(temp >> 16) & 0xFF] << 16 ) ^
-            (Sbox[(temp >> 24) & 0xFF] << 24);
+            (Sbox[(temp >> 16) & 0xFF] << 16) ^
+            ((unsigned int) Sbox[(temp >> 24) & 0xFF] << 24);
         w[i] = w[i-Nk] ^ temp;
         i++;
 
@@ -186,30 +186,30 @@ crypto_stream_beforenm(unsigned char *c, const unsigned char *k)
 }
 
 int
-crypto_stream_afternm(unsigned char *outp, unsigned long long len,
-                      const unsigned char *noncep, const unsigned char *c)
+crypto_stream_afternm(unsigned char *out, unsigned long long len,
+                      const unsigned char *nonce, const unsigned char *c)
 {
     ECRYPT_ctx * const ctx = (ECRYPT_ctx *) c;
     unsigned long long i;
 
-    ECRYPT_ivsetup(ctx, noncep);
+    ECRYPT_ivsetup(ctx, nonce);
     for (i = 0U; i < len; ++i) {
-        outp[i] = 0U;
+        out[i] = 0U;
     }
-    ECRYPT_encrypt_bytes(ctx, (u8 *) outp, (u8 *) outp, len);
+    ECRYPT_encrypt_bytes(ctx, (u8 *) out, (u8 *) out, len);
 
     return 0;
 }
 
 int
-crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp,
-                          unsigned long long len, const unsigned char *noncep,
+crypto_stream_xor_afternm(unsigned char *out, const unsigned char *in,
+                          unsigned long long len, const unsigned char *nonce,
                           const unsigned char *c)
 {
     ECRYPT_ctx * const ctx = (ECRYPT_ctx *) c;
 
-    ECRYPT_ivsetup(ctx, noncep);
-    ECRYPT_encrypt_bytes(ctx, (const u8 *) inp, (u8 *) outp, len);
+    ECRYPT_ivsetup(ctx, nonce);
+    ECRYPT_encrypt_bytes(ctx, (const u8 *) in, (u8 *) out, len);
 
     return 0;
 }
@@ -219,6 +219,7 @@ crypto_stream(unsigned char *out, unsigned long long outlen,
               const unsigned char *n, const unsigned char *k)
 {
     unsigned char d[crypto_stream_BEFORENMBYTES];
+
     crypto_stream_beforenm(d, k);
     crypto_stream_afternm(out, outlen, n, d);