From e747cec6770e7f6d9c53b99e6535521022240e8a Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 23 Feb 2017 11:22:36 +0100 Subject: [PATCH] Indent --- test/default/secretbox.c | 75 ++++++++++++++++++---------------- test/default/secretbox2.c | 53 ++++++++++++------------ test/default/secretbox7.c | 3 +- test/default/secretbox8.c | 5 ++- test/default/secretbox_easy.c | 71 +++++++++++++++++--------------- test/default/secretbox_easy2.c | 35 ++++++++-------- 6 files changed, 127 insertions(+), 115 deletions(-) diff --git a/test/default/secretbox.c b/test/default/secretbox.c index 264086e9..45a3fbdf 100644 --- a/test/default/secretbox.c +++ b/test/default/secretbox.c @@ -2,42 +2,45 @@ #define TEST_NAME "secretbox" #include "cmptest.h" -static 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 }; +static 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 }; -static 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 }; +static 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 }; /* API requires first 32 bytes to be 0 */ -static unsigned char m[163] - = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 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 }; +static unsigned char m[163] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 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 +}; static unsigned char c[163]; -int main(void) +int +main(void) { int i; crypto_secretbox(c, m, 163, nonce, firstkey); for (i = 16; i < 163; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); if (i % 8 == 7) printf("\n"); } @@ -46,7 +49,7 @@ int main(void) memcpy(c, m, 163); crypto_secretbox(c, c, 163, nonce, firstkey); for (i = 16; i < 163; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); if (i % 8 == 7) printf("\n"); } @@ -58,16 +61,16 @@ int main(void) assert(crypto_secretbox_boxzerobytes() > 0U); assert(crypto_secretbox_macbytes() > 0U); assert(strcmp(crypto_secretbox_primitive(), "xsalsa20poly1305") == 0); - assert(crypto_secretbox_keybytes() - == crypto_secretbox_xsalsa20poly1305_keybytes()); - assert(crypto_secretbox_noncebytes() - == crypto_secretbox_xsalsa20poly1305_noncebytes()); - assert(crypto_secretbox_zerobytes() - == crypto_secretbox_xsalsa20poly1305_zerobytes()); - assert(crypto_secretbox_boxzerobytes() - == crypto_secretbox_xsalsa20poly1305_boxzerobytes()); - assert(crypto_secretbox_macbytes() - == crypto_secretbox_xsalsa20poly1305_macbytes()); + assert(crypto_secretbox_keybytes() == + crypto_secretbox_xsalsa20poly1305_keybytes()); + assert(crypto_secretbox_noncebytes() == + crypto_secretbox_xsalsa20poly1305_noncebytes()); + assert(crypto_secretbox_zerobytes() == + crypto_secretbox_xsalsa20poly1305_zerobytes()); + assert(crypto_secretbox_boxzerobytes() == + crypto_secretbox_xsalsa20poly1305_boxzerobytes()); + assert(crypto_secretbox_macbytes() == + crypto_secretbox_xsalsa20poly1305_macbytes()); return 0; } diff --git a/test/default/secretbox2.c b/test/default/secretbox2.c index d3915f28..3e5247b3 100644 --- a/test/default/secretbox2.c +++ b/test/default/secretbox2.c @@ -2,42 +2,45 @@ #define TEST_NAME "secretbox2" #include "cmptest.h" -static 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 }; +static 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 }; -static 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 }; +static 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 }; /* API requires first 16 bytes to be 0 */ -static unsigned char c[163] - = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 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 }; +static unsigned char c[163] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 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 +}; static unsigned char m[163]; -int main(void) +int +main(void) { int i; if (crypto_secretbox_open(m, c, 163, nonce, firstkey) == 0) { for (i = 32; i < 163; ++i) { - printf(",0x%02x", (unsigned int)m[i]); + printf(",0x%02x", (unsigned int) m[i]); if (i % 8 == 7) printf("\n"); } diff --git a/test/default/secretbox7.c b/test/default/secretbox7.c index 97cff879..389943d2 100644 --- a/test/default/secretbox7.c +++ b/test/default/secretbox7.c @@ -8,7 +8,8 @@ static unsigned char m[10000]; static unsigned char c[10000]; static unsigned char m2[10000]; -int main(void) +int +main(void) { size_t mlen; size_t i; diff --git a/test/default/secretbox8.c b/test/default/secretbox8.c index a7a44d56..acba5f0c 100644 --- a/test/default/secretbox8.c +++ b/test/default/secretbox8.c @@ -8,11 +8,12 @@ static unsigned char m[10000]; static unsigned char c[10000]; static unsigned char m2[10000]; -int main(void) +int +main(void) { size_t mlen; size_t i; - int caught; + int caught; for (mlen = 0; mlen < 1000 && mlen + crypto_secretbox_ZEROBYTES < sizeof m; ++mlen) { diff --git a/test/default/secretbox_easy.c b/test/default/secretbox_easy.c index f5854422..1dfcc004 100644 --- a/test/default/secretbox_easy.c +++ b/test/default/secretbox_easy.c @@ -2,51 +2,54 @@ #define TEST_NAME "secretbox_easy" #include "cmptest.h" -static 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 }; +static 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 }; -static 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 }; +static 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 }; -static 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 }; +static 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 +}; -int main(void) +int +main(void) { unsigned char *c; unsigned char *mac; size_t i; - c = (unsigned char *) sodium_malloc(131 + crypto_secretbox_MACBYTES + 1); + c = (unsigned char *) sodium_malloc(131 + crypto_secretbox_MACBYTES + 1); mac = (unsigned char *) sodium_malloc(crypto_secretbox_MACBYTES); assert(c != NULL && mac != NULL); crypto_secretbox_easy(c, m, 131, nonce, firstkey); for (i = 0; i < 131 + crypto_secretbox_MACBYTES; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); crypto_secretbox_detached(c, mac, m, 131, nonce, firstkey); for (i = 0; i < crypto_secretbox_MACBYTES; ++i) { - printf(",0x%02x", (unsigned int)mac[i]); + printf(",0x%02x", (unsigned int) mac[i]); } for (i = 0; i < 131; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); @@ -55,21 +58,21 @@ int main(void) memcpy(c + 1, m, 131); crypto_secretbox_easy(c, c + 1, 131, nonce, firstkey); for (i = 0; i < 131 + crypto_secretbox_MACBYTES; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); memcpy(c, m, 131); crypto_secretbox_easy(c + 1, c, 131, nonce, firstkey); for (i = 0; i < 131 + crypto_secretbox_MACBYTES; ++i) { - printf(",0x%02x", (unsigned int)c[i + 1]); + printf(",0x%02x", (unsigned int) c[i + 1]); } printf("\n"); memcpy(c, m, 131); crypto_secretbox_easy(c, c, 131, nonce, firstkey); for (i = 0; i < 131 + crypto_secretbox_MACBYTES; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); @@ -79,20 +82,20 @@ int main(void) crypto_secretbox_easy(c, c, 0, nonce, firstkey); for (i = 0; i < crypto_secretbox_MACBYTES + 1; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); - if (crypto_secretbox_open_easy(c, c, crypto_secretbox_MACBYTES, - nonce, firstkey) != 0) { + if (crypto_secretbox_open_easy(c, c, crypto_secretbox_MACBYTES, nonce, + firstkey) != 0) { printf("Null crypto_secretbox_open_easy() failed\n"); } for (i = 0; i < crypto_secretbox_MACBYTES + 1; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); c[randombytes_uniform(crypto_secretbox_MACBYTES)]++; - if (crypto_secretbox_open_easy(c, c, crypto_secretbox_MACBYTES, - nonce, firstkey) != -1) { + if (crypto_secretbox_open_easy(c, c, crypto_secretbox_MACBYTES, nonce, + firstkey) != -1) { printf("Null tampered crypto_secretbox_open_easy() failed\n"); } diff --git a/test/default/secretbox_easy2.c b/test/default/secretbox_easy2.c index 8a4838ff..e8fb6baf 100644 --- a/test/default/secretbox_easy2.c +++ b/test/default/secretbox_easy2.c @@ -2,7 +2,8 @@ #define TEST_NAME "secretbox_easy2" #include "cmptest.h" -int main(void) +int +main(void) { unsigned char *m; unsigned char *m2; @@ -10,30 +11,30 @@ int main(void) unsigned char *nonce; unsigned char *k; unsigned char *mac; - size_t mlen; - size_t i; + size_t mlen; + size_t i; - mlen = (size_t) randombytes_uniform((uint32_t) 10000) + 1U; - m = (unsigned char *) sodium_malloc(mlen); - m2 = (unsigned char *) sodium_malloc(mlen); - c = (unsigned char *) sodium_malloc(crypto_secretbox_MACBYTES + mlen); + mlen = (size_t) randombytes_uniform((uint32_t) 10000) + 1U; + m = (unsigned char *) sodium_malloc(mlen); + m2 = (unsigned char *) sodium_malloc(mlen); + c = (unsigned char *) sodium_malloc(crypto_secretbox_MACBYTES + mlen); nonce = (unsigned char *) sodium_malloc(crypto_secretbox_NONCEBYTES); - k = (unsigned char *) sodium_malloc(crypto_secretbox_KEYBYTES); - mac = (unsigned char *) sodium_malloc(crypto_secretbox_MACBYTES); + k = (unsigned char *) sodium_malloc(crypto_secretbox_KEYBYTES); + mac = (unsigned char *) sodium_malloc(crypto_secretbox_MACBYTES); crypto_secretbox_keygen(k); randombytes_buf(m, (unsigned long long) mlen); randombytes_buf(nonce, crypto_secretbox_NONCEBYTES); crypto_secretbox_easy(c, m, (unsigned long long) mlen, nonce, k); - if (crypto_secretbox_open_easy(m2, c, - (unsigned long long) mlen + crypto_secretbox_MACBYTES, - nonce, k) != 0) { + if (crypto_secretbox_open_easy( + m2, c, (unsigned long long) mlen + crypto_secretbox_MACBYTES, nonce, + k) != 0) { printf("crypto_secretbox_open_easy() failed\n"); } printf("%d\n", memcmp(m, m2, mlen)); for (i = 0; i < mlen + crypto_secretbox_MACBYTES - 1; i++) { - if (crypto_secretbox_open_easy(m2, c, (unsigned long long) i, - nonce, k) == 0) { + if (crypto_secretbox_open_easy(m2, c, (unsigned long long) i, nonce, + k) == 0) { printf("short open() should have failed\n"); return 1; } @@ -49,9 +50,9 @@ int main(void) crypto_secretbox_easy(c, c, (unsigned long long) mlen, nonce, k); printf("%d\n", memcmp(m, c, mlen) == 0); printf("%d\n", memcmp(m, c + crypto_secretbox_MACBYTES, mlen) == 0); - if (crypto_secretbox_open_easy(c, c, - (unsigned long long) mlen + crypto_secretbox_MACBYTES, - nonce, k) != 0) { + if (crypto_secretbox_open_easy( + c, c, (unsigned long long) mlen + crypto_secretbox_MACBYTES, nonce, + k) != 0) { printf("crypto_secretbox_open_easy() failed\n"); } printf("%d\n", memcmp(m, c, mlen));