cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sizeof() -> constants

Browse Source
This commit is contained in:
Frank Denis 2016-03-23 15:55:45 +01:00
parent 2b79c12f93
commit cb150c2d3d
1 changed files with 93 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
test/default/aead_chacha20poly1305.c
View File

@ -5,33 +5,38 @@
static int static int
tv(void) tv(void)
{ {
#undef MLEN
#define MLEN 10U
#undef ADLEN
#define ADLEN 10U
#undef CLEN
#define CLEN (MLEN + crypto_aead_chacha20poly1305_ABYTES)
static const unsigned char firstkey[crypto_aead_chacha20poly1305_KEYBYTES] static const unsigned char firstkey[crypto_aead_chacha20poly1305_KEYBYTES]
= { 0x42, 0x90, 0xbc, 0xb1, 0x54, 0x17, 0x35, 0x31, 0xf3, 0x14, 0xaf, = { 0x42, 0x90, 0xbc, 0xb1, 0x54, 0x17, 0x35, 0x31, 0xf3, 0x14, 0xaf,
0x57, 0xf3, 0xbe, 0x3b, 0x50, 0x06, 0xda, 0x37, 0x1e, 0xce, 0x27, 0x57, 0xf3, 0xbe, 0x3b, 0x50, 0x06, 0xda, 0x37, 0x1e, 0xce, 0x27,
0x2a, 0xfa, 0x1b, 0x5d, 0xbd, 0xd1, 0x10, 0x0a, 0x10, 0x07 }; 0x2a, 0xfa, 0x1b, 0x5d, 0xbd, 0xd1, 0x10, 0x0a, 0x10, 0x07 };
static const unsigned char m[10U] static const unsigned char m[MLEN]
= { 0x86, 0xd0, 0x99, 0x74, 0x84, 0x0b, 0xde, 0xd2, 0xa5, 0xca }; = { 0x86, 0xd0, 0x99, 0x74, 0x84, 0x0b, 0xde, 0xd2, 0xa5, 0xca };
static const unsigned char nonce[crypto_aead_chacha20poly1305_NPUBBYTES] static const unsigned char nonce[crypto_aead_chacha20poly1305_NPUBBYTES]
= { 0xcd, 0x7c, 0xf6, 0x7b, 0xe3, 0x9c, 0x79, 0x4a }; = { 0xcd, 0x7c, 0xf6, 0x7b, 0xe3, 0x9c, 0x79, 0x4a };
static const unsigned char ad[10U] static const unsigned char ad[ADLEN]
= { 0x87, 0xe2, 0x29, 0xd4, 0x50, 0x08, 0x45, 0xa0, 0x79, 0xc0 }; = { 0x87, 0xe2, 0x29, 0xd4, 0x50, 0x08, 0x45, 0xa0, 0x79, 0xc0 };
unsigned char c[CLEN];
unsigned char c[10U + crypto_aead_chacha20poly1305_ABYTES]; unsigned char detached_c[MLEN];
unsigned char detached_c[10U];
unsigned char mac[crypto_aead_chacha20poly1305_ABYTES]; unsigned char mac[crypto_aead_chacha20poly1305_ABYTES];
unsigned char m2[10U]; unsigned char m2[MLEN];
unsigned long long found_clen; unsigned long long found_clen;
unsigned long long found_maclen; unsigned long long found_maclen;
unsigned long long m2len; unsigned long long m2len;
size_t i; size_t i;
crypto_aead_chacha20poly1305_encrypt(c, &found_clen, m, sizeof m, crypto_aead_chacha20poly1305_encrypt(c, &found_clen, m, MLEN,
ad, sizeof ad, ad, ADLEN,
NULL, nonce, firstkey); NULL, nonce, firstkey);
if (found_clen != sizeof m + crypto_aead_chacha20poly1305_abytes()) { if (found_clen != CLEN) {
printf("found_clen is not properly set\n"); printf("found_clen is not properly set\n");
} }
for (i = 0U; i < sizeof c; ++i) { for (i = 0U; i < CLEN; ++i) {
printf(",0x%02x", (unsigned int) c[i]); printf(",0x%02x", (unsigned int) c[i]);
if (i % 8 == 7) { if (i % 8 == 7) {
printf("\n"); printf("\n");
@ -40,56 +45,56 @@ tv(void)
printf("\n"); printf("\n");
crypto_aead_chacha20poly1305_encrypt_detached(detached_c, crypto_aead_chacha20poly1305_encrypt_detached(detached_c,
mac, &found_maclen, mac, &found_maclen,
m, sizeof m, ad, sizeof ad, m, MLEN, ad, ADLEN,
NULL, nonce, firstkey); NULL, nonce, firstkey);
if (found_maclen != crypto_aead_chacha20poly1305_abytes()) { if (found_maclen != crypto_aead_chacha20poly1305_abytes()) {
printf("found_maclen is not properly set\n"); printf("found_maclen is not properly set\n");
} }
if (memcmp(detached_c, c, sizeof m) != 0) { if (memcmp(detached_c, c, MLEN) != 0) {
printf("detached ciphertext is bogus\n"); printf("detached ciphertext is bogus\n");
} }
if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, sizeof c, if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, CLEN,
ad, sizeof ad, ad, ADLEN,
nonce, firstkey) != 0) { nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_decrypt() failed\n"); printf("crypto_aead_chacha20poly1305_decrypt() failed\n");
} }
if (m2len != sizeof c - crypto_aead_chacha20poly1305_abytes()) { if (m2len != MLEN) {
printf("m2len is not properly set\n"); printf("m2len is not properly set\n");
} }
if (memcmp(m, m2, sizeof m) != 0) { if (memcmp(m, m2, MLEN) != 0) {
printf("m != m2\n"); printf("m != m2\n");
} }
memset(m2, 0, m2len); memset(m2, 0, m2len);
if (crypto_aead_chacha20poly1305_decrypt_detached(m2, &m2len, NULL, if (crypto_aead_chacha20poly1305_decrypt_detached(m2, &m2len, NULL,
c, sizeof m, mac, c, MLEN, mac,
ad, sizeof ad, ad, ADLEN,
nonce, firstkey) != 0) { nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_decrypt_detached() failed\n"); printf("crypto_aead_chacha20poly1305_decrypt_detached() failed\n");
} }
if (m2len != sizeof c - crypto_aead_chacha20poly1305_abytes()) { if (m2len != MLEN) {
printf("detached m2len is not properly set\n"); printf("detached m2len is not properly set\n");
} }
if (memcmp(m, m2, sizeof m) != 0) { if (memcmp(m, m2, MLEN) != 0) {
printf("detached m != m2\n"); printf("detached m != m2\n");
} }
for (i = 0U; i < sizeof c; i++) { for (i = 0U; i < CLEN; i++) {
c[i] ^= (i + 1U); c[i] ^= (i + 1U);
if (crypto_aead_chacha20poly1305_decrypt(m2, NULL, NULL, c, sizeof c, if (crypto_aead_chacha20poly1305_decrypt(m2, NULL, NULL, c, CLEN,
ad, sizeof ad, nonce, firstkey) ad, ADLEN, nonce, firstkey)
== 0 || memcmp(m, m2, sizeof m) == 0) { == 0 || memcmp(m, m2, MLEN) == 0) {
printf("message can be forged\n"); printf("message can be forged\n");
} }
c[i] ^= (i + 1U); c[i] ^= (i + 1U);
} }
crypto_aead_chacha20poly1305_encrypt(c, &found_clen, m, sizeof m, crypto_aead_chacha20poly1305_encrypt(c, &found_clen, m, MLEN,
NULL, 0U, NULL, nonce, firstkey); NULL, 0U, NULL, nonce, firstkey);
if (found_clen != sizeof m + crypto_aead_chacha20poly1305_abytes()) { if (found_clen != CLEN) {
printf("found_clen is not properly set (adlen=0)\n"); printf("found_clen is not properly set (adlen=0)\n");
} }
for (i = 0U; i < sizeof c; ++i) { for (i = 0U; i < CLEN; ++i) {
printf(",0x%02x", (unsigned int) c[i]); printf(",0x%02x", (unsigned int) c[i]);
if (i % 8 == 7) { if (i % 8 == 7) {
printf("\n"); printf("\n");
@ -97,14 +102,14 @@ tv(void)
} }
printf("\n"); printf("\n");
if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, sizeof c, if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, CLEN,
NULL, 0U, nonce, firstkey) != 0) { NULL, 0U, nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_decrypt() failed (adlen=0)\n"); printf("crypto_aead_chacha20poly1305_decrypt() failed (adlen=0)\n");
} }
if (m2len != sizeof c - crypto_aead_chacha20poly1305_abytes()) { if (m2len != MLEN) {
printf("m2len is not properly set (adlen=0)\n"); printf("m2len is not properly set (adlen=0)\n");
} }
if (memcmp(m, m2, sizeof m) != 0) { if (memcmp(m, m2, MLEN) != 0) {
printf("m != m2 (adlen=0)\n"); printf("m != m2 (adlen=0)\n");
} }
@ -120,13 +125,13 @@ tv(void)
"ciphertext\n"); "ciphertext\n");
} }
memcpy(c, m, sizeof m); memcpy(c, m, MLEN);
crypto_aead_chacha20poly1305_encrypt(c, &found_clen, c, sizeof m, crypto_aead_chacha20poly1305_encrypt(c, &found_clen, c, MLEN,
NULL, 0U, NULL, nonce, firstkey); NULL, 0U, NULL, nonce, firstkey);
if (found_clen != sizeof m + crypto_aead_chacha20poly1305_abytes()) { if (found_clen != CLEN) {
printf("found_clen is not properly set (adlen=0)\n"); printf("found_clen is not properly set (adlen=0)\n");
} }
for (i = 0U; i < sizeof c; ++i) { for (i = 0U; i < CLEN; ++i) {
printf(",0x%02x", (unsigned int) c[i]); printf(",0x%02x", (unsigned int) c[i]);
if (i % 8 == 7) { if (i % 8 == 7) {
printf("\n"); printf("\n");
@ -134,14 +139,14 @@ tv(void)
} }
printf("\n"); printf("\n");
if (crypto_aead_chacha20poly1305_decrypt(c, &m2len, NULL, c, sizeof c, if (crypto_aead_chacha20poly1305_decrypt(c, &m2len, NULL, c, CLEN,
NULL, 0U, nonce, firstkey) != 0) { NULL, 0U, nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_decrypt() failed (adlen=0)\n"); printf("crypto_aead_chacha20poly1305_decrypt() failed (adlen=0)\n");
} }
if (m2len != sizeof c - crypto_aead_chacha20poly1305_abytes()) { if (m2len != MLEN) {
printf("m2len is not properly set (adlen=0)\n"); printf("m2len is not properly set (adlen=0)\n");
} }
if (memcmp(m, c, sizeof m) != 0) { if (memcmp(m, c, MLEN) != 0) {
printf("m != c (adlen=0)\n"); printf("m != c (adlen=0)\n");
} }
@ -155,6 +160,12 @@ tv(void)
static int static int
tv_ietf(void) tv_ietf(void)
{ {
#undef MLEN
#define MLEN 114U
#undef ADLEN
#define ADLEN 12U
#undef CLEN
#define CLEN (MLEN + crypto_aead_chacha20poly1305_ABYTES)
static const unsigned char firstkey[crypto_aead_chacha20poly1305_ietf_KEYBYTES] static const unsigned char firstkey[crypto_aead_chacha20poly1305_ietf_KEYBYTES]
= { = {
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
@ -165,30 +176,30 @@ tv_ietf(void)
#undef MESSAGE #undef MESSAGE
#define MESSAGE "Ladies and Gentlemen of the class of '99: If I could offer you " \ #define MESSAGE "Ladies and Gentlemen of the class of '99: If I could offer you " \
"only one tip for the future, sunscreen would be it." "only one tip for the future, sunscreen would be it."
unsigned char m[114U]; unsigned char m[MLEN];
static const unsigned char nonce[crypto_aead_chacha20poly1305_ietf_NPUBBYTES] static const unsigned char nonce[crypto_aead_chacha20poly1305_ietf_NPUBBYTES]
= { 0x07, 0x00, 0x00, 0x00, = { 0x07, 0x00, 0x00, 0x00,
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47 }; 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47 };
static const unsigned char ad[12U] static const unsigned char ad[ADLEN]
= { 0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 }; = { 0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 };
unsigned char c[114U + crypto_aead_chacha20poly1305_ietf_ABYTES]; unsigned char c[MLEN + crypto_aead_chacha20poly1305_ietf_ABYTES];
unsigned char detached_c[114U]; unsigned char detached_c[MLEN];
unsigned char mac[crypto_aead_chacha20poly1305_ietf_ABYTES]; unsigned char mac[crypto_aead_chacha20poly1305_ietf_ABYTES];
unsigned char m2[114U]; unsigned char m2[MLEN];
unsigned long long found_clen; unsigned long long found_clen;
unsigned long long found_maclen; unsigned long long found_maclen;
unsigned long long m2len; unsigned long long m2len;
size_t i; size_t i;
assert(sizeof MESSAGE - 1U == sizeof m); assert(sizeof MESSAGE - 1U == MLEN);
memcpy(m, MESSAGE, sizeof m); memcpy(m, MESSAGE, MLEN);
crypto_aead_chacha20poly1305_ietf_encrypt(c, &found_clen, m, sizeof m, crypto_aead_chacha20poly1305_ietf_encrypt(c, &found_clen, m, MLEN,
ad, sizeof ad, ad, ADLEN,
NULL, nonce, firstkey); NULL, nonce, firstkey);
if (found_clen != sizeof m + crypto_aead_chacha20poly1305_ietf_abytes()) { if (found_clen != MLEN + crypto_aead_chacha20poly1305_ietf_abytes()) {
printf("found_clen is not properly set\n"); printf("found_clen is not properly set\n");
} }
for (i = 0U; i < sizeof c; ++i) { for (i = 0U; i < CLEN; ++i) {
printf(",0x%02x", (unsigned int) c[i]); printf(",0x%02x", (unsigned int) c[i]);
if (i % 8 == 7) { if (i % 8 == 7) {
printf("\n"); printf("\n");
@ -197,69 +208,69 @@ tv_ietf(void)
printf("\n"); printf("\n");
crypto_aead_chacha20poly1305_ietf_encrypt_detached(detached_c, crypto_aead_chacha20poly1305_ietf_encrypt_detached(detached_c,
mac, &found_maclen, mac, &found_maclen,
m, sizeof m, m, MLEN,
ad, sizeof ad, ad, ADLEN,
NULL, nonce, firstkey); NULL, nonce, firstkey);
if (found_maclen != crypto_aead_chacha20poly1305_ietf_abytes()) { if (found_maclen != crypto_aead_chacha20poly1305_ietf_abytes()) {
printf("found_maclen is not properly set\n"); printf("found_maclen is not properly set\n");
} }
if (memcmp(detached_c, c, sizeof m) != 0) { if (memcmp(detached_c, c, MLEN) != 0) {
printf("detached ciphertext is bogus\n"); printf("detached ciphertext is bogus\n");
} }
if (crypto_aead_chacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, sizeof c, ad, if (crypto_aead_chacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, CLEN, ad,
sizeof ad, nonce, firstkey) != 0) { ADLEN, nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_ietf_decrypt() failed\n"); printf("crypto_aead_chacha20poly1305_ietf_decrypt() failed\n");
} }
if (m2len != sizeof c - crypto_aead_chacha20poly1305_ietf_abytes()) { if (m2len != MLEN) {
printf("m2len is not properly set\n"); printf("m2len is not properly set\n");
} }
if (memcmp(m, m2, sizeof m) != 0) { if (memcmp(m, m2, MLEN) != 0) {
printf("m != m2\n"); printf("m != m2\n");
} }
memset(m2, 0, m2len); memset(m2, 0, m2len);
if (crypto_aead_chacha20poly1305_ietf_decrypt_detached(m2, &m2len, NULL, if (crypto_aead_chacha20poly1305_ietf_decrypt_detached(m2, &m2len, NULL,
c, sizeof m, mac, c, MLEN, mac,
ad, sizeof ad, ad, ADLEN,
nonce, firstkey) != 0) { nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_ietf_decrypt_detached() failed\n"); printf("crypto_aead_chacha20poly1305_ietf_decrypt_detached() failed\n");
} }
if (m2len != sizeof c - crypto_aead_chacha20poly1305_ietf_abytes()) { if (m2len != MLEN) {
printf("detached m2len is not properly set\n"); printf("detached m2len is not properly set\n");
} }
if (memcmp(m, m2, sizeof m) != 0) { if (memcmp(m, m2, MLEN) != 0) {
printf("detached m != m2\n"); printf("detached m != m2\n");
} }
for (i = 0U; i < sizeof c; i++) { for (i = 0U; i < CLEN; i++) {
c[i] ^= (i + 1U); c[i] ^= (i + 1U);
if (crypto_aead_chacha20poly1305_ietf_decrypt(m2, NULL, NULL, c, sizeof c, if (crypto_aead_chacha20poly1305_ietf_decrypt(m2, NULL, NULL, c, CLEN,
ad, sizeof ad, nonce, firstkey) ad, ADLEN, nonce, firstkey)
== 0 || memcmp(m, m2, sizeof m) == 0) { == 0 || memcmp(m, m2, MLEN) == 0) {
printf("message can be forged\n"); printf("message can be forged\n");
} }
c[i] ^= (i + 1U); c[i] ^= (i + 1U);
} }
crypto_aead_chacha20poly1305_ietf_encrypt(c, &found_clen, m, sizeof m, crypto_aead_chacha20poly1305_ietf_encrypt(c, &found_clen, m, MLEN,
NULL, 0U, NULL, nonce, firstkey); NULL, 0U, NULL, nonce, firstkey);
if (found_clen != sizeof m + crypto_aead_chacha20poly1305_ietf_abytes()) { if (found_clen != CLEN) {
printf("clen is not properly set (adlen=0)\n"); printf("clen is not properly set (adlen=0)\n");
} }
for (i = 0U; i < sizeof c; ++i) { for (i = 0U; i < CLEN; ++i) {
printf(",0x%02x", (unsigned int) c[i]); printf(",0x%02x", (unsigned int) c[i]);
if (i % 8 == 7) { if (i % 8 == 7) {
printf("\n"); printf("\n");
} }
} }
printf("\n"); printf("\n");
if (crypto_aead_chacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, sizeof c, if (crypto_aead_chacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, CLEN,
NULL, 0U, nonce, firstkey) != 0) { NULL, 0U, nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_ietf_decrypt() failed (adlen=0)\n"); printf("crypto_aead_chacha20poly1305_ietf_decrypt() failed (adlen=0)\n");
} }
if (m2len != sizeof c - crypto_aead_chacha20poly1305_ietf_abytes()) { if (m2len != MLEN) {
printf("m2len is not properly set (adlen=0)\n"); printf("m2len is not properly set (adlen=0)\n");
} }
if (memcmp(m, m2, sizeof m) != 0) { if (memcmp(m, m2, MLEN) != 0) {
printf("m != m2 (adlen=0)\n"); printf("m != m2 (adlen=0)\n");
} }
@ -275,13 +286,13 @@ tv_ietf(void)
"ciphertext\n"); "ciphertext\n");
} }
memcpy(c, m, sizeof m); memcpy(c, m, MLEN);
crypto_aead_chacha20poly1305_ietf_encrypt(c, &found_clen, c, sizeof m, crypto_aead_chacha20poly1305_ietf_encrypt(c, &found_clen, c, MLEN,
NULL, 0U, NULL, nonce, firstkey); NULL, 0U, NULL, nonce, firstkey);
if (found_clen != sizeof m + crypto_aead_chacha20poly1305_ietf_abytes()) { if (found_clen != CLEN) {
printf("clen is not properly set (adlen=0)\n"); printf("clen is not properly set (adlen=0)\n");
} }
for (i = 0U; i < sizeof c; ++i) { for (i = 0U; i < CLEN; ++i) {
printf(",0x%02x", (unsigned int) c[i]); printf(",0x%02x", (unsigned int) c[i]);
if (i % 8 == 7) { if (i % 8 == 7) {
printf("\n"); printf("\n");
@ -289,14 +300,14 @@ tv_ietf(void)
} }
printf("\n"); printf("\n");
if (crypto_aead_chacha20poly1305_ietf_decrypt(c, &m2len, NULL, c, sizeof c, if (crypto_aead_chacha20poly1305_ietf_decrypt(c, &m2len, NULL, c, CLEN,
NULL, 0U, nonce, firstkey) != 0) { NULL, 0U, nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_ietf_decrypt() failed (adlen=0)\n"); printf("crypto_aead_chacha20poly1305_ietf_decrypt() failed (adlen=0)\n");
} }
if (m2len != sizeof c - crypto_aead_chacha20poly1305_ietf_abytes()) { if (m2len != MLEN) {
printf("m2len is not properly set (adlen=0)\n"); printf("m2len is not properly set (adlen=0)\n");
} }
if (memcmp(m, c, sizeof m) != 0) { if (memcmp(m, c, MLEN) != 0) {
printf("m != c (adlen=0)\n"); printf("m != c (adlen=0)\n");
} }