diff --git a/.gitignore b/.gitignore index 7ddc9879..59777667 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,7 @@ test/default/box test/default/box2 test/default/box7 test/default/box8 +test/default/box_easy test/default/core1 test/default/core2 test/default/core3 diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index b108f6e6..6946786e 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -12,6 +12,7 @@ libsodium_la_SOURCES = \ crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c \ crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c \ crypto_box/crypto_box.c \ + crypto_box/crypto_box_easy.c \ crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305_api.c \ crypto_box/curve25519xsalsa20poly1305/ref/api.h \ crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c \ diff --git a/src/libsodium/crypto_box/crypto_box_easy.c b/src/libsodium/crypto_box/crypto_box_easy.c new file mode 100644 index 00000000..2992db80 --- /dev/null +++ b/src/libsodium/crypto_box/crypto_box_easy.c @@ -0,0 +1,88 @@ + +#include +#include +#include +#include + +#include "crypto_box.h" +#include "utils.h" + +int +crypto_box_easy(unsigned char *c, const unsigned char *m, + unsigned long long mlen, const unsigned char *n, + const unsigned char *pk, const unsigned char *sk) +{ + 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_box_ZEROBYTES) { + return -1; + } + (void) sizeof(char[crypto_box_ZEROBYTES >= + crypto_box_BOXZEROBYTES ? 1 : -1]); + m_boxed_len = (size_t) mlen + crypto_box_ZEROBYTES; + if ((m_boxed = malloc((size_t) m_boxed_len)) == NULL) { + return -1; + } + c_boxed_len = (size_t) mlen + crypto_box_ZEROBYTES; + if ((c_boxed = malloc(c_boxed_len)) == NULL) { + free(m_boxed); + return -1; + } + memset(m_boxed, 0, crypto_box_ZEROBYTES); + memcpy(m_boxed + crypto_box_ZEROBYTES, m, mlen); + rc = crypto_box(c_boxed, m_boxed, m_boxed_len, n, pk, sk); + 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_box_BOXZEROBYTES == + mlen + crypto_box_MACBYTES ? 1 : -1]); + memcpy(c, c_boxed + crypto_box_BOXZEROBYTES, mlen + crypto_box_MACBYTES); + free(c_boxed); + + return 0; +} + +int +crypto_box_open_easy(unsigned char *m, const unsigned char *c, + unsigned long long clen, const unsigned char *n, + const unsigned char *pk, const unsigned char *sk) +{ + unsigned char *c_boxed; + unsigned char *m_boxed; + size_t c_boxed_len; + size_t m_boxed_len; + int rc; + + if (clen < crypto_box_MACBYTES || + clen > SIZE_MAX - crypto_box_BOXZEROBYTES) { + return -1; + } + c_boxed_len = clen + crypto_box_BOXZEROBYTES; + if ((c_boxed = malloc(c_boxed_len)) == NULL) { + return -1; + } + memset(c_boxed, 0, crypto_box_BOXZEROBYTES); + memcpy(c_boxed + crypto_box_BOXZEROBYTES, c, clen); + m_boxed_len = c_boxed_len + crypto_box_MACBYTES; + if ((m_boxed = malloc(m_boxed_len)) == NULL) { + return -1; + } + rc = crypto_box_open(m_boxed, c_boxed, + (unsigned long long) c_boxed_len, n, pk, sk); + free(c_boxed); + if (rc != 0) { + free(m_boxed); + return -1; + } + memcpy(m, m_boxed + crypto_box_ZEROBYTES, clen - crypto_box_MACBYTES); + free(m_boxed); + + return 0; +} diff --git a/src/libsodium/include/sodium/crypto_box.h b/src/libsodium/include/sodium/crypto_box.h index 95a0d602..e65db71b 100644 --- a/src/libsodium/include/sodium/crypto_box.h +++ b/src/libsodium/include/sodium/crypto_box.h @@ -79,6 +79,16 @@ int crypto_box_open(unsigned char *m, const unsigned char *c, unsigned long long clen, const unsigned char *n, const unsigned char *pk, const unsigned char *sk); +SODIUM_EXPORT +int crypto_box_easy(unsigned char *c, const unsigned char *m, + unsigned long long mlen, const unsigned char *n, + const unsigned char *pk, const unsigned char *sk); + +SODIUM_EXPORT +int crypto_box_open_easy(unsigned char *m, const unsigned char *c, + unsigned long long clen, const unsigned char *n, + const unsigned char *pk, const unsigned char *sk); + #ifdef __cplusplus } #endif diff --git a/test/default/Makefile.am b/test/default/Makefile.am index 9c6f1e06..f1ef77e6 100644 --- a/test/default/Makefile.am +++ b/test/default/Makefile.am @@ -10,6 +10,7 @@ EXTRA_DIST = \ box2.exp \ box7.exp \ box8.exp \ + box_easy.exp \ core1.exp \ core2.exp \ core3.exp \ @@ -55,6 +56,7 @@ DISTCLEANFILES = \ box2.res \ box7.res \ box8.res \ + box_easy.res \ core1.res \ core2.res \ core3.res \ @@ -108,6 +110,7 @@ TESTS_TARGETS = \ box2 \ box7 \ box8 \ + box_easy \ core1 \ core2 \ core3 \ @@ -175,6 +178,9 @@ 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) + core1_SOURCE = cmptest.h core1.c core1_LDADD = $(TESTS_LDADD) diff --git a/test/default/box_easy.c b/test/default/box_easy.c new file mode 100644 index 00000000..10319879 --- /dev/null +++ b/test/default/box_easy.c @@ -0,0 +1,59 @@ +#include + +#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; +} diff --git a/test/default/box_easy.exp b/test/default/box_easy.exp new file mode 100644 index 00000000..2b6c51ea --- /dev/null +++ b/test/default/box_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