Add an easy interface to secretbox

.gitignore

@@ -87,6 +87,7 @@ test/default/secretbox
 test/default/secretbox2
 test/default/secretbox7
 test/default/secretbox8
+test/default/secretbox_easy
 test/default/shorthash
 test/default/sodium_core
 test/default/sodium_utils

src/libsodium/Makefile.am

@@ -65,6 +65,7 @@ libsodium_la_SOURCES = \
 	crypto_scalarmult/crypto_scalarmult.c \
 	crypto_scalarmult/curve25519/scalarmult_curve25519_api.c \
 	crypto_secretbox/crypto_secretbox.c \
+	crypto_secretbox/crypto_secretbox_easy.c \
 	crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c \
 	crypto_secretbox/xsalsa20poly1305/ref/api.h \
 	crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c \

src/libsodium/crypto_secretbox/crypto_secretbox_easy.c

@@ -0,0 +1,90 @@
+
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "crypto_secretbox.h"
+#include "utils.h"
+
+int
+crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
+                      unsigned long long mlen, const unsigned char *n,
+                      const unsigned char *k)
+{
+    unsigned char *c_boxed;
+    unsigned char *m_boxed;
+    size_t         c_boxed_len;
+    size_t         m_boxed_len;
+    int            rc;
+
+    if (mlen > SIZE_MAX - crypto_secretbox_ZEROBYTES) {
+        return -1;
+    }
+    (void) sizeof(char[crypto_secretbox_ZEROBYTES >=
+                       crypto_secretbox_BOXZEROBYTES ? 1 : -1]);
+    m_boxed_len = (size_t) mlen + crypto_secretbox_ZEROBYTES;
+    if ((m_boxed = (unsigned char *) malloc((size_t) m_boxed_len)) == NULL) {
+        return -1;
+    }
+    c_boxed_len = (size_t) mlen + crypto_secretbox_ZEROBYTES;
+    if ((c_boxed = (unsigned char *) malloc(c_boxed_len)) == NULL) {
+        free(m_boxed);
+        return -1;
+    }
+    memset(m_boxed, 0, crypto_secretbox_ZEROBYTES);
+    memcpy(m_boxed + crypto_secretbox_ZEROBYTES, m, mlen);
+    rc = crypto_secretbox(c_boxed, m_boxed, m_boxed_len, n, k);
+    sodium_memzero(m_boxed, m_boxed_len);
+    free(m_boxed);
+    if (rc != 0) {
+        free(c_boxed);
+        return -1;
+    }
+    (void) sizeof(char[m_boxed_len - crypto_secretbox_BOXZEROBYTES ==
+                       mlen + crypto_secretbox_MACBYTES ? 1 : -1]);
+    memcpy(c, c_boxed + crypto_secretbox_BOXZEROBYTES,
+           mlen + crypto_secretbox_MACBYTES);
+    free(c_boxed);
+
+    return 0;
+}
+
+int
+crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
+                           unsigned long long clen, const unsigned char *n,
+                           const unsigned char *k)
+{
+    unsigned char *c_boxed;
+    unsigned char *m_boxed;
+    size_t         c_boxed_len;
+    size_t         m_boxed_len;
+    int            rc;
+
+    if (clen < crypto_secretbox_MACBYTES ||
+        clen > SIZE_MAX - crypto_secretbox_BOXZEROBYTES) {
+        return -1;
+    }
+    c_boxed_len = clen + crypto_secretbox_BOXZEROBYTES;
+    if ((c_boxed = (unsigned char *) malloc(c_boxed_len)) == NULL) {
+        return -1;
+    }
+    memset(c_boxed, 0, crypto_secretbox_BOXZEROBYTES);
+    memcpy(c_boxed + crypto_secretbox_BOXZEROBYTES, c, clen);
+    m_boxed_len = c_boxed_len + crypto_secretbox_MACBYTES;
+    if ((m_boxed = (unsigned char *) malloc(m_boxed_len)) == NULL) {
+        return -1;
+    }
+    rc = crypto_secretbox_open(m_boxed, c_boxed,
+                               (unsigned long long) c_boxed_len, n, k);
+    free(c_boxed);
+    if (rc != 0) {
+        free(m_boxed);
+        return -1;
+    }
+    memcpy(m, m_boxed + crypto_secretbox_ZEROBYTES,
+           clen - crypto_secretbox_MACBYTES);
+    free(m_boxed);
+
+    return 0;
+}

src/libsodium/include/sodium/crypto_secretbox.h

@@ -47,6 +47,16 @@ int crypto_secretbox_open(unsigned char *m, const unsigned char *c,
                           unsigned long long clen, const unsigned char *n,
                           const unsigned char *k);
 
+SODIUM_EXPORT
+int crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
+                          unsigned long long mlen, const unsigned char *n,
+                          const unsigned char *k);
+
+SODIUM_EXPORT
+int crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
+                               unsigned long long clen, const unsigned char *n,
+                               const unsigned char *k);
+
 #ifdef __cplusplus
 }
 #endif

test/default/Makefile.am

@@ -37,6 +37,7 @@ EXTRA_DIST = \
 	secretbox2.exp \
 	secretbox7.exp \
 	secretbox8.exp \
+	secretbox_easy.exp \
 	shorthash.exp \
 	sodium_core.exp \
 	sodium_utils.exp \
@@ -84,6 +85,7 @@ DISTCLEANFILES = \
 	secretbox2.res \
 	secretbox7.res \
 	secretbox8.res \
+	secretbox_easy.res \
 	shorthash.res \
 	sodium_core.res \
 	sodium_utils.res \
@@ -139,6 +141,7 @@ TESTS_TARGETS = \
 	secretbox2 \
 	secretbox7 \
 	secretbox8 \
+	secretbox_easy \
 	shorthash \
 	sodium_core \
 	sodium_utils \
@@ -262,6 +265,9 @@ 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)
+
 shorthash_SOURCE          = cmptest.h shorthash.c
 shorthash_LDADD           = $(TESTS_LDADD)
 

test/default/secretbox_easy.c

@@ -0,0 +1,51 @@
+#include <stdio.h>
+
+#define TEST_NAME "secretbox_easy"
+#include "cmptest.h"
+
+unsigned char firstkey[32] = {
+ 0x1b,0x27,0x55,0x64,0x73,0xe9,0x85,0xd4
+,0x62,0xcd,0x51,0x19,0x7a,0x9a,0x46,0xc7
+,0x60,0x09,0x54,0x9e,0xac,0x64,0x74,0xf2
+,0x06,0xc4,0xee,0x08,0x44,0xf6,0x83,0x89
+} ;
+
+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_secretbox_MACBYTES];
+
+int main(void)
+{
+  int i;
+  crypto_secretbox_easy(c, m, 131, nonce, firstkey);
+  for (i = 0;i < 131 + crypto_secretbox_MACBYTES; ++i) {
+    printf(",0x%02x",(unsigned int) c[i]);
+    if (i % 8 == 7) printf("\n");
+  }
+  printf("\n");
+  return 0;
+}

test/default/secretbox_easy.exp

@@ -0,0 +1,19 @@
+,0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5
+,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9
+,0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73
+,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce
+,0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4
+,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a
+,0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b
+,0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72
+,0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2
+,0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38
+,0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a
+,0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae
+,0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea
+,0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda
+,0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde
+,0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3
+,0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6
+,0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74
+,0xe3,0x55,0xa5