rbnacl-libsodium 0.4.5 → 0.5.0

data/vendor/libsodium/src/libsodium/sodium/utils.c

@@ -1,10 +1,17 @@
-
+#ifndef __STDC_WANT_LIB_EXT1__
+# define __STDC_WANT_LIB_EXT1__ 1
+#endif
+#include <errno.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+
 #include "utils.h"
 #include "randombytes.h"
 #ifdef _WIN32
@@ -17,6 +24,12 @@ sodium_memzero(void * const pnt, const size_t len)
 {
 #ifdef HAVE_SECUREZEROMEMORY
     SecureZeroMemory(pnt, len);
+#elif defined(HAVE_MEMSET_S)
+    if (memset_s(pnt, (rsize_t) len, 0, (rsize_t) len) != 0) {
+        abort();
+    }
+#elif defined(HAVE_EXPLICIT_BZERO)
+    explicit_bzero(pnt, len);
 #else
     volatile unsigned char *pnt_ = (volatile unsigned char *) pnt;
     size_t                     i = (size_t) 0U;
@@ -28,17 +41,17 @@ sodium_memzero(void * const pnt, const size_t len)
 }
 
 int
-sodium_memcmp(const void * const b1_, const void * const b2_, size_t size)
+sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
 {
     const unsigned char *b1 = (const unsigned char *) b1_;
     const unsigned char *b2 = (const unsigned char *) b2_;
     size_t               i;
     unsigned char        d = (unsigned char) 0U;
 
-    for (i = 0U; i < size; i++) {
+    for (i = 0U; i < len; i++) {
         d |= b1[i] ^ b2[i];
     }
-    return (int) d;
+    return (int) ((1 & ((d - 1) >> 8)) - 1);
 }
 
 unsigned char *
@@ -70,8 +83,8 @@ _sodium_alignedcalloc(unsigned char ** const unaligned_p, const size_t len)
 }
 
 char *
-sodium_bin2hex(char * const hex, const size_t hexlen,
-               const unsigned char *bin, const size_t binlen)
+sodium_bin2hex(char * const hex, const size_t hex_maxlen,
+               const unsigned char * const bin, const size_t bin_len)
 {
     static const char hexdigits[16] = {
         '0', '1', '2', '3', '4', '5', '6', '7',
@@ -80,10 +93,10 @@ sodium_bin2hex(char * const hex, const size_t hexlen,
     size_t            i = (size_t) 0U;
     size_t            j = (size_t) 0U;
 
-    if (binlen >= SIZE_MAX / 2 || hexlen < binlen * 2U) {
+    if (bin_len >= SIZE_MAX / 2 || hex_maxlen < bin_len * 2U) {
         abort();
     }
-    while (i < binlen) {
+    while (i < bin_len) {
         hex[j++] = hexdigits[bin[i] >> 4];
         hex[j++] = hexdigits[bin[i] & 0xf];
         i++;
@@ -92,3 +105,82 @@ sodium_bin2hex(char * const hex, const size_t hexlen,
 
     return hex;
 }
+
+int
+sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen,
+               const char * const hex, const size_t hex_len,
+               const char * const ignore, size_t * const bin_len,
+               const char ** const hex_end)
+{
+    size_t        bin_pos = (size_t) 0U;
+    size_t        hex_pos = (size_t) 0U;
+    int           ret = 0;
+    unsigned char c;
+    unsigned char c_acc = 0U;
+    unsigned char c_num;
+    unsigned char c_val;
+    unsigned char state = 0U;
+
+    while (hex_pos < hex_len) {
+        c = (unsigned char) hex[hex_pos];
+        if ((c_num = c ^ 48U) < 10U) {
+            c_val = c_num;
+        } else if ((c_num = (c & ~32U)) > 64 && c_num < 71U) {
+            c_val = c_num - 55U;
+        } else if (ignore != NULL && strchr(ignore, c) != NULL && state == 0U) {
+            hex_pos++;
+            continue;
+        } else {
+            break;
+        }
+        if (bin_pos >= bin_maxlen) {
+            ret = -1;
+            errno = ERANGE;
+            break;
+        }
+        if (state == 0U) {
+            c_acc = c_val * 16U;
+        } else {
+            bin[bin_pos++] = c_acc | c_val;
+        }
+        state = ~state;
+        hex_pos++;
+    }
+    if (state != 0U) {
+        hex_pos--;
+    }
+    if (hex_end != NULL) {
+        *hex_end = &hex[hex_pos];
+    }
+    if (bin_len != NULL) {
+        *bin_len = bin_pos;
+    }
+    return ret;
+}
+
+int
+sodium_mlock(void * const addr, const size_t len)
+{
+#ifdef HAVE_MLOCK
+    return mlock(addr, len);
+#elif defined(HAVE_VIRTUALLOCK)
+    return -(VirtualLock(addr, len) == 0);
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+int
+sodium_munlock(void * const addr, const size_t len)
+{
+    sodium_memzero(addr, len);
+#ifdef HAVE_MLOCK
+    return munlock(addr, len);
+#elif defined(HAVE_VIRTUALLOCK)
+    return -(VirtualUnlock(addr, len) == 0);
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}

data/vendor/libsodium/test/default/Makefile.am

@@ -6,10 +6,14 @@ EXTRA_DIST = \
 	auth2.exp \
 	auth3.exp \
 	auth5.exp \
+	auth6.exp \
+	auth7.exp \
 	box.exp \
 	box2.exp \
 	box7.exp \
 	box8.exp \
+	box_easy.exp \
+	box_easy2.exp \
 	core1.exp \
 	core2.exp \
 	core3.exp \
@@ -18,12 +22,14 @@ EXTRA_DIST = \
 	core6.exp \
 	generichash.exp \
 	generichash2.exp \
+	generichash3.exp \
 	hash.exp \
 	hash2.exp \
 	hash3.exp \
 	onetimeauth.exp \
 	onetimeauth2.exp \
 	onetimeauth7.exp \
+	pwhash.exp \
 	scalarmult.exp \
 	scalarmult2.exp \
 	scalarmult5.exp \
@@ -34,7 +40,10 @@ EXTRA_DIST = \
 	secretbox2.exp \
 	secretbox7.exp \
 	secretbox8.exp \
+	secretbox_easy.exp \
+	secretbox_easy2.exp \
 	shorthash.exp \
+	sign.exp \
 	sodium_core.exp \
 	sodium_utils.exp \
 	sodium_version.exp \
@@ -43,17 +52,22 @@ EXTRA_DIST = \
 	stream3.exp \
 	stream4.exp \
 	stream5.exp \
-	stream6.exp
+	stream6.exp \
+	verify1.exp
 
 DISTCLEANFILES = \
 	auth.res \
 	auth2.res \
 	auth3.res \
 	auth5.res \
+	auth6.res \
+	auth7.res \
 	box.res \
 	box2.res \
 	box7.res \
 	box8.res \
+	box_easy.res \
+	box_easy2.res \
 	core1.res \
 	core2.res \
 	core3.res \
@@ -62,12 +76,14 @@ DISTCLEANFILES = \
 	core6.res \
 	generichash.res \
 	generichash2.res \
+	generichash3.res \
 	hash.res \
 	hash2.res \
 	hash3.res \
 	onetimeauth.res \
 	onetimeauth2.res \
 	onetimeauth7.res \
+	pwhash.res \
 	scalarmult.res \
 	scalarmult2.res \
 	scalarmult5.res \
@@ -78,7 +94,10 @@ DISTCLEANFILES = \
 	secretbox2.res \
 	secretbox7.res \
 	secretbox8.res \
+	secretbox_easy.res \
+	secretbox_easy2.res \
 	shorthash.res \
+	sign.res \
 	sodium_core.res \
 	sodium_utils.res \
 	sodium_version.res \
@@ -87,7 +106,8 @@ DISTCLEANFILES = \
 	stream3.res \
 	stream4.res \
 	stream5.res \
-	stream6.res
+	stream6.res \
+	verify1.res
 
 AM_CPPFLAGS = \
 	-DTEST_SRCDIR=\"@srcdir@\" \
@@ -102,10 +122,14 @@ TESTS_TARGETS = \
 	auth2 \
 	auth3 \
 	auth5 \
+	auth6 \
+	auth7 \
 	box \
 	box2 \
 	box7 \
 	box8 \
+	box_easy \
+	box_easy2 \
 	core1 \
 	core2 \
 	core3 \
@@ -114,11 +138,13 @@ TESTS_TARGETS = \
 	core6 \
 	generichash \
 	generichash2 \
+	generichash3 \
 	hash \
 	hash3 \
 	onetimeauth \
 	onetimeauth2 \
 	onetimeauth7 \
+	pwhash \
 	randombytes \
 	scalarmult \
 	scalarmult2 \
@@ -130,7 +156,10 @@ TESTS_TARGETS = \
 	secretbox2 \
 	secretbox7 \
 	secretbox8 \
+	secretbox_easy \
+	secretbox_easy2 \
 	shorthash \
+	sign \
 	sodium_core \
 	sodium_utils \
 	sodium_version \
@@ -139,7 +168,8 @@ TESTS_TARGETS = \
 	stream3 \
 	stream4 \
 	stream5 \
-	stream6
+	stream6 \
+	verify1
 
 check_PROGRAMS = $(TESTS_TARGETS)
 
@@ -160,6 +190,12 @@ auth3_LDADD               = $(TESTS_LDADD)
 auth5_SOURCE              = cmptest.h auth5.c windows/windows-quirks.h
 auth5_LDADD               = $(TESTS_LDADD)
 
+auth6_SOURCE              = cmptest.h auth6.c windows/windows-quirks.h
+auth6_LDADD               = $(TESTS_LDADD)
+
+auth7_SOURCE              = cmptest.h auth7.c windows/windows-quirks.h
+auth7_LDADD               = $(TESTS_LDADD)
+
 box_SOURCE                = cmptest.h box.c
 box_LDADD                 = $(TESTS_LDADD)
 
@@ -172,6 +208,12 @@ box7_LDADD                = $(TESTS_LDADD)
 box8_SOURCE               = cmptest.h box8.c
 box8_LDADD                = $(TESTS_LDADD)
 
+box_easy_SOURCE           = cmptest.h box_easy.c
+box_easy_LDADD            = $(TESTS_LDADD)
+
+box_easy2_SOURCE          = cmptest.h box_easy2.c
+box_easy2_LDADD           = $(TESTS_LDADD)
+
 core1_SOURCE              = cmptest.h core1.c
 core1_LDADD               = $(TESTS_LDADD)
 
@@ -196,6 +238,9 @@ generichash_LDADD         = $(TESTS_LDADD)
 generichash2_SOURCE       = cmptest.h generichash2.c
 generichash2_LDADD        = $(TESTS_LDADD)
 
+generichash3_SOURCE       = cmptest.h generichash3.c
+generichash3_LDADD        = $(TESTS_LDADD)
+
 hash_SOURCE               = cmptest.h hash.c
 hash_LDADD                = $(TESTS_LDADD)
 
@@ -211,6 +256,9 @@ onetimeauth2_LDADD        = $(TESTS_LDADD)
 onetimeauth7_SOURCE       = cmptest.h onetimeauth7.c
 onetimeauth7_LDADD        = $(TESTS_LDADD)
 
+pwhash_SOURCE             = cmptest.h pwhash.c
+pwhash_LDADD              = $(TESTS_LDADD)
+
 randombytes_SOURCE        = randombytes.c
 randombytes_LDADD         = $(TESTS_LDADD)
 
@@ -244,9 +292,18 @@ secretbox7_LDADD          = $(TESTS_LDADD)
 secretbox8_SOURCE         = cmptest.h secretbox8.c
 secretbox8_LDADD          = $(TESTS_LDADD)
 
+secretbox_easy_SOURCE     = cmptest.h secretbox_easy.c
+secretbox_easy_LDADD      = $(TESTS_LDADD)
+
+secretbox_easy2_SOURCE    = cmptest.h secretbox_easy2.c
+secretbox_easy2_LDADD     = $(TESTS_LDADD)
+
 shorthash_SOURCE          = cmptest.h shorthash.c
 shorthash_LDADD           = $(TESTS_LDADD)
 
+sign_SOURCE               = cmptest.h sign.c
+sign_LDADD                = $(TESTS_LDADD)
+
 sodium_core_SOURCE        = cmptest.h sodium_core.c
 sodium_core_LDADD         = $(TESTS_LDADD)
 
@@ -274,4 +331,7 @@ stream5_LDADD             = $(TESTS_LDADD)
 stream6_SOURCE            = cmptest.h stream6.c
 stream6_LDADD             = $(TESTS_LDADD)
 
+verify1_SOURCE            = cmptest.h verify1.c
+verify1_LDADD             = $(TESTS_LDADD)
+
 verify: check

data/vendor/libsodium/test/default/auth6.c

@@ -0,0 +1,21 @@
+#include <stdio.h>
+
+#define TEST_NAME "auth6"
+#include "cmptest.h"
+
+/* "Test Case 2" from RFC 4231 */
+unsigned char key[32] = "Jefe";
+unsigned char c[] = "what do ya want for nothing?";
+
+unsigned char a[64];
+
+int main(void)
+{
+  int i;
+  crypto_auth_hmacsha512(a,c,sizeof c - 1U,key);
+  for (i = 0;i < 64;++i) {
+    printf(",0x%02x",(unsigned int) a[i]);
+    if (i % 8 == 7) printf("\n");
+  }
+  return 0;
+}

data/vendor/libsodium/test/default/auth6.exp

@@ -0,0 +1,8 @@
+,0x16,0x4b,0x7a,0x7b,0xfc,0xf8,0x19,0xe2
+,0xe3,0x95,0xfb,0xe7,0x3b,0x56,0xe0,0xa3
+,0x87,0xbd,0x64,0x22,0x2e,0x83,0x1f,0xd6
+,0x10,0x27,0x0c,0xd7,0xea,0x25,0x05,0x54
+,0x97,0x58,0xbf,0x75,0xc0,0x5a,0x99,0x4a
+,0x6d,0x03,0x4f,0x65,0xf8,0xf0,0xe6,0xfd
+,0xca,0xea,0xb1,0xa3,0x4d,0x4a,0x6b,0x4b
+,0x63,0x6e,0x07,0x0a,0x38,0xbc,0xe7,0x37

data/vendor/libsodium/test/default/auth7.c

@@ -0,0 +1,37 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include "windows/windows-quirks.h"
+
+#define TEST_NAME "auth7"
+#include "cmptest.h"
+
+unsigned char key[32];
+unsigned char c[10000];
+unsigned char a[64];
+
+int main(void)
+{
+  int clen;
+  for (clen = 0;clen < 10000;++clen) {
+    randombytes(key,sizeof key);
+    randombytes(c,clen);
+    crypto_auth_hmacsha512(a,c,clen,key);
+    if (crypto_auth_hmacsha512_verify(a,c,clen,key) != 0) {
+      printf("fail %d\n",clen);
+      return 100;
+    }
+    if (clen > 0) {
+      c[rand() % clen] += 1 + (rand() % 255);
+      if (crypto_auth_hmacsha512_verify(a,c,clen,key) == 0) {
+        printf("forgery %d\n",clen);
+        return 100;
+      }
+      a[rand() % sizeof a] += 1 + (rand() % 255);
+      if (crypto_auth_hmacsha512_verify(a,c,clen,key) == 0) {
+        printf("forgery %d\n",clen);
+        return 100;
+      }
+    }
+  }
+  return 0;
+}

data/vendor/libsodium/test/default/box_easy.c

@@ -0,0 +1,59 @@
+#include <stdio.h>
+
+#define TEST_NAME "box_easy"
+#include "cmptest.h"
+
+unsigned char alicesk[32] = {
+ 0x77,0x07,0x6d,0x0a,0x73,0x18,0xa5,0x7d
+,0x3c,0x16,0xc1,0x72,0x51,0xb2,0x66,0x45
+,0xdf,0x4c,0x2f,0x87,0xeb,0xc0,0x99,0x2a
+,0xb1,0x77,0xfb,0xa5,0x1d,0xb9,0x2c,0x2a
+} ;
+
+unsigned char bobpk[32] = {
+ 0xde,0x9e,0xdb,0x7d,0x7b,0x7d,0xc1,0xb4
+,0xd3,0x5b,0x61,0xc2,0xec,0xe4,0x35,0x37
+,0x3f,0x83,0x43,0xc8,0x5b,0x78,0x67,0x4d
+,0xad,0xfc,0x7e,0x14,0x6f,0x88,0x2b,0x4f
+} ;
+
+unsigned char nonce[24] = {
+ 0x69,0x69,0x6e,0xe9,0x55,0xb6,0x2b,0x73
+,0xcd,0x62,0xbd,0xa8,0x75,0xfc,0x73,0xd6
+,0x82,0x19,0xe0,0x03,0x6b,0x7a,0x0b,0x37
+} ;
+
+unsigned char m[131] = {
+ 0xbe,0x07,0x5f,0xc5,0x3c,0x81,0xf2,0xd5
+,0xcf,0x14,0x13,0x16,0xeb,0xeb,0x0c,0x7b
+,0x52,0x28,0xc5,0x2a,0x4c,0x62,0xcb,0xd4
+,0x4b,0x66,0x84,0x9b,0x64,0x24,0x4f,0xfc
+,0xe5,0xec,0xba,0xaf,0x33,0xbd,0x75,0x1a
+,0x1a,0xc7,0x28,0xd4,0x5e,0x6c,0x61,0x29
+,0x6c,0xdc,0x3c,0x01,0x23,0x35,0x61,0xf4
+,0x1d,0xb6,0x6c,0xce,0x31,0x4a,0xdb,0x31
+,0x0e,0x3b,0xe8,0x25,0x0c,0x46,0xf0,0x6d
+,0xce,0xea,0x3a,0x7f,0xa1,0x34,0x80,0x57
+,0xe2,0xf6,0x55,0x6a,0xd6,0xb1,0x31,0x8a
+,0x02,0x4a,0x83,0x8f,0x21,0xaf,0x1f,0xde
+,0x04,0x89,0x77,0xeb,0x48,0xf5,0x9f,0xfd
+,0x49,0x24,0xca,0x1c,0x60,0x90,0x2e,0x52
+,0xf0,0xa0,0x89,0xbc,0x76,0x89,0x70,0x40
+,0xe0,0x82,0xf9,0x37,0x76,0x38,0x48,0x64
+,0x5e,0x07,0x05
+} ;
+
+unsigned char c[147 + crypto_box_MACBYTES];
+
+int main(void)
+{
+    int i;
+
+    crypto_box_easy(c, m, 131, nonce, bobpk, alicesk);
+    for (i = 0; i < 131 + crypto_box_MACBYTES; ++i) {
+        printf(",0x%02x",(unsigned int) c[i]);
+        if (i % 8 == 7) printf("\n");
+    }
+    printf("\n");
+    return 0;
+}