From 3d96ea4b6af69783d7fa699c796d24ad55b1609a Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 23 Feb 2017 11:27:19 +0100 Subject: [PATCH] Indent --- test/default/box_easy.c | 68 +++++++++++++++++++------------------ test/default/box_easy2.c | 73 ++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 65 deletions(-) diff --git a/test/default/box_easy.c b/test/default/box_easy.c index 141f1c9e..c75debb1 100644 --- a/test/default/box_easy.c +++ b/test/default/box_easy.c @@ -2,37 +2,41 @@ #define TEST_NAME "box_easy" #include "cmptest.h" -static 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 }; +static 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 }; -static 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 }; +static 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 }; -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 +}; static unsigned char c[147 + crypto_box_MACBYTES]; -int main(void) +int +main(void) { size_t i; int ret; @@ -40,7 +44,7 @@ int main(void) ret = crypto_box_easy(c, m, 131, nonce, bobpk, alicesk); assert(ret == 0); for (i = 0; i < 131 + crypto_box_MACBYTES; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); @@ -49,19 +53,19 @@ int main(void) ret = crypto_box_easy(c, c, 0, nonce, bobpk, alicesk); assert(ret == 0); for (i = 0; i < 1 + crypto_box_MACBYTES; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); - ret = crypto_box_open_easy(c, c, crypto_box_MACBYTES, nonce, - bobpk, alicesk); + ret = + crypto_box_open_easy(c, c, crypto_box_MACBYTES, nonce, bobpk, alicesk); assert(ret == 0); for (i = 0; i < 1 + crypto_box_MACBYTES; ++i) { - printf(",0x%02x", (unsigned int)c[i]); + printf(",0x%02x", (unsigned int) c[i]); } printf("\n"); c[randombytes_uniform(crypto_box_MACBYTES)]++; - ret = crypto_box_open_easy(c, c, crypto_box_MACBYTES, nonce, - bobpk, alicesk); + ret = + crypto_box_open_easy(c, c, crypto_box_MACBYTES, nonce, bobpk, alicesk); assert(ret == -1); assert(crypto_box_easy(c, m, SIZE_MAX - 1U, nonce, bobpk, alicesk) == -1); diff --git a/test/default/box_easy2.c b/test/default/box_easy2.c index 710f997c..6169d356 100644 --- a/test/default/box_easy2.c +++ b/test/default/box_easy2.c @@ -2,12 +2,14 @@ #define TEST_NAME "box_easy2" #include "cmptest.h" -static const unsigned char small_order_p[crypto_box_PUBLICKEYBYTES] - = { 0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, 0x16, 0x56, 0xe3, - 0xfa, 0xf1, 0x9f, 0xc4, 0x6a, 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32, - 0xb1, 0xfd, 0x86, 0x62, 0x05, 0x16, 0x5f, 0x49, 0xb8, 0x00 }; +static const unsigned char small_order_p[crypto_box_PUBLICKEYBYTES] = { + 0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, 0x16, 0x56, 0xe3, + 0xfa, 0xf1, 0x9f, 0xc4, 0x6a, 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32, + 0xb1, 0xfd, 0x86, 0x62, 0x05, 0x16, 0x5f, 0x49, 0xb8, 0x00 +}; -int main(void) +int +main(void) { unsigned char *alicepk; unsigned char *alicesk; @@ -28,18 +30,18 @@ int main(void) int ret; m2_size = m_size = 1U + randombytes_uniform(1000); - c_size = crypto_box_MACBYTES + m_size; - m = (unsigned char *) sodium_malloc(m_size); - m2 = (unsigned char *) sodium_malloc(m2_size); - c = (unsigned char *) sodium_malloc(c_size); + c_size = crypto_box_MACBYTES + m_size; + m = (unsigned char *) sodium_malloc(m_size); + m2 = (unsigned char *) sodium_malloc(m2_size); + c = (unsigned char *) sodium_malloc(c_size); alicepk = (unsigned char *) sodium_malloc(crypto_box_PUBLICKEYBYTES); alicesk = (unsigned char *) sodium_malloc(crypto_box_SECRETKEYBYTES); - bobpk = (unsigned char *) sodium_malloc(crypto_box_PUBLICKEYBYTES); - bobsk = (unsigned char *) sodium_malloc(crypto_box_SECRETKEYBYTES); - mac = (unsigned char *) sodium_malloc(crypto_box_MACBYTES); - nonce = (unsigned char *) sodium_malloc(crypto_box_NONCEBYTES); - k1 = (unsigned char *) sodium_malloc(crypto_box_BEFORENMBYTES); - k2 = (unsigned char *) sodium_malloc(crypto_box_BEFORENMBYTES); + bobpk = (unsigned char *) sodium_malloc(crypto_box_PUBLICKEYBYTES); + bobsk = (unsigned char *) sodium_malloc(crypto_box_SECRETKEYBYTES); + mac = (unsigned char *) sodium_malloc(crypto_box_MACBYTES); + nonce = (unsigned char *) sodium_malloc(crypto_box_NONCEBYTES); + k1 = (unsigned char *) sodium_malloc(crypto_box_BEFORENMBYTES); + k2 = (unsigned char *) sodium_malloc(crypto_box_BEFORENMBYTES); crypto_box_keypair(alicepk, alicesk); crypto_box_keypair(bobpk, bobsk); mlen = (size_t) randombytes_uniform((uint32_t) m_size) + 1U; @@ -56,14 +58,15 @@ int main(void) printf("%d\n", memcmp(m, m2, mlen)); for (i = 0; i < mlen + crypto_box_MACBYTES - 1; i++) { - if (crypto_box_open_easy(m2, c, (unsigned long long) i, - nonce, alicepk, bobsk) == 0) { + if (crypto_box_open_easy(m2, c, (unsigned long long) i, nonce, alicepk, + bobsk) == 0) { printf("short open() should have failed"); return 1; } } memcpy(c, m, mlen); - ret = crypto_box_easy(c, c, (unsigned long long) mlen, nonce, bobpk, alicesk); + ret = + crypto_box_easy(c, c, (unsigned long long) mlen, nonce, bobpk, alicesk); assert(ret == 0); printf("%d\n", memcmp(m, c, mlen) == 0); printf("%d\n", memcmp(m, c + crypto_box_MACBYTES, mlen) == 0); @@ -86,35 +89,39 @@ int main(void) memset(m2, 0, m2_size); if (crypto_box_easy_afternm(c, m, SIZE_MAX - 1U, nonce, k1) == 0) { - printf("crypto_box_easy_afternm() with a short ciphertext should have failed\n"); + printf( + "crypto_box_easy_afternm() with a short ciphertext should have " + "failed\n"); } crypto_box_easy_afternm(c, m, (unsigned long long) mlen, nonce, k1); - if (crypto_box_open_easy_afternm(m2, c, - (unsigned long long) mlen + crypto_box_MACBYTES, - nonce, k2) != 0) { + if (crypto_box_open_easy_afternm( + m2, c, (unsigned long long) mlen + crypto_box_MACBYTES, nonce, + k2) != 0) { printf("crypto_box_open_easy_afternm() failed\n"); } printf("%d\n", memcmp(m, m2, mlen)); - if (crypto_box_open_easy_afternm(m2, c, crypto_box_MACBYTES - 1U, - nonce, k2) == 0) { - printf("crypto_box_open_easy_afternm() with a huge ciphertext should have failed\n"); + if (crypto_box_open_easy_afternm(m2, c, crypto_box_MACBYTES - 1U, nonce, + k2) == 0) { + printf( + "crypto_box_open_easy_afternm() with a huge ciphertext should have " + "failed\n"); } memset(m2, 0, m2_size); - ret = crypto_box_detached(c, mac, m, (unsigned long long) mlen, - nonce, small_order_p, bobsk); + ret = crypto_box_detached(c, mac, m, (unsigned long long) mlen, nonce, + small_order_p, bobsk); assert(ret == -1); - ret = crypto_box_detached(c, mac, m, (unsigned long long) mlen, - nonce, alicepk, bobsk); + ret = crypto_box_detached(c, mac, m, (unsigned long long) mlen, nonce, + alicepk, bobsk); assert(ret == 0); - if (crypto_box_open_detached(m2, c, mac, (unsigned long long) mlen, - nonce, bobpk, alicesk) != 0) { + if (crypto_box_open_detached(m2, c, mac, (unsigned long long) mlen, nonce, + bobpk, alicesk) != 0) { printf("crypto_box_open_detached() failed\n"); } printf("%d\n", memcmp(m, m2, mlen)); memset(m2, 0, m2_size); - crypto_box_detached_afternm(c, mac, m, (unsigned long long) mlen, - nonce, k1); + crypto_box_detached_afternm(c, mac, m, (unsigned long long) mlen, nonce, + k1); if (crypto_box_open_detached_afternm(m2, c, mac, (unsigned long long) mlen, nonce, k2) != 0) { printf("crypto_box_open_detached_afternm() failed\n");