From 4d276a81e7af8e8d32236ff5e522646007196c4d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 13 Sep 2014 14:11:12 -0700 Subject: [PATCH] Include header files commonly used by the tests to cmptest.h --- test/default/aead_chacha20poly1305.c | 6 ++++-- test/default/auth.c | 6 +++++- test/default/auth2.c | 2 -- test/default/auth3.c | 2 -- test/default/auth5.c | 3 +-- test/default/auth6.c | 1 - test/default/auth7.c | 3 +-- test/default/box.c | 1 - test/default/box2.c | 1 - test/default/box7.c | 1 - test/default/box8.c | 3 +-- test/default/box_easy.c | 1 - test/default/box_easy2.c | 2 -- test/default/box_seed.c | 1 - test/default/chacha20.c | 3 --- test/default/cmptest.h | 4 ++++ test/default/core1.c | 1 - test/default/core2.c | 1 - test/default/core3.c | 1 - test/default/core4.c | 1 - test/default/core5.c | 1 - test/default/core6.c | 1 - test/default/ed25519_convert.c | 2 -- test/default/generichash.c | 1 - test/default/generichash2.c | 1 - test/default/generichash3.c | 1 - test/default/hash.c | 1 - test/default/hash3.c | 1 - test/default/onetimeauth.c | 1 - test/default/onetimeauth2.c | 1 - test/default/onetimeauth7.c | 3 +-- test/default/pwhash.c | 2 -- test/default/pwhash_scrypt_ll.c | 3 --- test/default/scalarmult.c | 1 - test/default/scalarmult2.c | 1 - test/default/scalarmult5.c | 1 - test/default/scalarmult6.c | 1 - test/default/secretbox.c | 1 - test/default/secretbox2.c | 1 - test/default/secretbox7.c | 1 - test/default/secretbox8.c | 3 +-- test/default/secretbox_easy.c | 1 - test/default/secretbox_easy2.c | 2 -- test/default/shorthash.c | 1 - test/default/sign.c | 2 -- test/default/sodium_core.c | 1 - test/default/sodium_utils.c | 2 -- test/default/sodium_utils2.c | 3 --- test/default/sodium_utils3.c | 3 --- test/default/sodium_version.c | 1 - test/default/stream.c | 1 - test/default/stream2.c | 1 - test/default/stream3.c | 1 - test/default/stream4.c | 1 - test/default/verify1.c | 2 -- 55 files changed, 18 insertions(+), 77 deletions(-) diff --git a/test/default/aead_chacha20poly1305.c b/test/default/aead_chacha20poly1305.c index 036d0014..39829c3c 100644 --- a/test/default/aead_chacha20poly1305.c +++ b/test/default/aead_chacha20poly1305.c @@ -1,5 +1,3 @@ -#include -#include #define TEST_NAME "aead_chacha20poly1305" #include "cmptest.h" @@ -93,5 +91,9 @@ int main(void) printf("m != m2 (adlen=0)\n"); } + assert(crypto_aead_chacha20poly1305_keybytes() > 0U); + assert(crypto_aead_chacha20poly1305_npubbytes() > 0U); + assert(crypto_aead_chacha20poly1305_nsecbytes() == 0U); + return 0; } diff --git a/test/default/auth.c b/test/default/auth.c index b424b52d..68f43b83 100644 --- a/test/default/auth.c +++ b/test/default/auth.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "auth" #include "cmptest.h" @@ -17,5 +16,10 @@ int main(void) printf(",0x%02x",(unsigned int) a[i]); if (i % 8 == 7) printf("\n"); } + + assert(crypto_auth_bytes() > 0U); + assert(crypto_auth_keybytes() > 0U); + assert(strcmp(crypto_auth_primitive(), "hmacsha512256") == 0); + return 0; } diff --git a/test/default/auth2.c b/test/default/auth2.c index b3301cfe..b975538a 100644 --- a/test/default/auth2.c +++ b/test/default/auth2.c @@ -1,7 +1,5 @@ /* "Test Case AUTH256-4" from RFC 4868 */ -#include - #define TEST_NAME "auth2" #include "cmptest.h" diff --git a/test/default/auth3.c b/test/default/auth3.c index 08e275ad..a20460d4 100644 --- a/test/default/auth3.c +++ b/test/default/auth3.c @@ -1,7 +1,5 @@ /* "Test Case AUTH256-4" from RFC 4868 */ -#include - #define TEST_NAME "auth3" #include "cmptest.h" diff --git a/test/default/auth5.c b/test/default/auth5.c index 4f06ac0e..bb41ff83 100644 --- a/test/default/auth5.c +++ b/test/default/auth5.c @@ -1,5 +1,4 @@ -#include -#include + #include "windows/windows-quirks.h" #define TEST_NAME "auth5" diff --git a/test/default/auth6.c b/test/default/auth6.c index 5bf0500f..63a87b9e 100644 --- a/test/default/auth6.c +++ b/test/default/auth6.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "auth6" #include "cmptest.h" diff --git a/test/default/auth7.c b/test/default/auth7.c index be67312b..1cf8fa7d 100644 --- a/test/default/auth7.c +++ b/test/default/auth7.c @@ -1,5 +1,4 @@ -#include -#include + #include "windows/windows-quirks.h" #define TEST_NAME "auth7" diff --git a/test/default/box.c b/test/default/box.c index 567446eb..86e235d5 100644 --- a/test/default/box.c +++ b/test/default/box.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "box" #include "cmptest.h" diff --git a/test/default/box2.c b/test/default/box2.c index c1a1a5f0..0cbacd44 100644 --- a/test/default/box2.c +++ b/test/default/box2.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "box2" #include "cmptest.h" diff --git a/test/default/box7.c b/test/default/box7.c index ea7b484e..3b53e7ce 100644 --- a/test/default/box7.c +++ b/test/default/box7.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "box7" #include "cmptest.h" diff --git a/test/default/box8.c b/test/default/box8.c index cc85057a..fb3b45a0 100644 --- a/test/default/box8.c +++ b/test/default/box8.c @@ -1,5 +1,4 @@ -#include -#include + #include "windows/windows-quirks.h" #define TEST_NAME "box8" diff --git a/test/default/box_easy.c b/test/default/box_easy.c index d3b899fc..804ca25b 100644 --- a/test/default/box_easy.c +++ b/test/default/box_easy.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "box_easy" #include "cmptest.h" diff --git a/test/default/box_easy2.c b/test/default/box_easy2.c index c8753ee6..44acc73e 100644 --- a/test/default/box_easy2.c +++ b/test/default/box_easy2.c @@ -1,5 +1,3 @@ -#include -#include #define TEST_NAME "box_easy2" #include "cmptest.h" diff --git a/test/default/box_seed.c b/test/default/box_seed.c index 653f294a..72413ab8 100644 --- a/test/default/box_seed.c +++ b/test/default/box_seed.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "box_seed" #include "cmptest.h" diff --git a/test/default/chacha20.c b/test/default/chacha20.c index 6dbc16c8..862f2987 100644 --- a/test/default/chacha20.c +++ b/test/default/chacha20.c @@ -1,7 +1,4 @@ -#include -#include - #define TEST_NAME "chacha20" #include "cmptest.h" diff --git a/test/default/cmptest.h b/test/default/cmptest.h index ae84e43e..156640c2 100644 --- a/test/default/cmptest.h +++ b/test/default/cmptest.h @@ -2,7 +2,11 @@ #ifndef __CMPTEST_H__ #define __CMPTEST_H__ +#include #include +#include +#include +#include #include "sodium.h" diff --git a/test/default/core1.c b/test/default/core1.c index 4c9453fa..7db20c3a 100644 --- a/test/default/core1.c +++ b/test/default/core1.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "core1" #include "cmptest.h" diff --git a/test/default/core2.c b/test/default/core2.c index b07df8df..a650e5c7 100644 --- a/test/default/core2.c +++ b/test/default/core2.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "core2" #include "cmptest.h" diff --git a/test/default/core3.c b/test/default/core3.c index 5d24fdda..f190568b 100644 --- a/test/default/core3.c +++ b/test/default/core3.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "core3" #include "cmptest.h" diff --git a/test/default/core4.c b/test/default/core4.c index d818723a..ae2ba589 100644 --- a/test/default/core4.c +++ b/test/default/core4.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "core4" #include "cmptest.h" diff --git a/test/default/core5.c b/test/default/core5.c index 467b27a4..10365a3a 100644 --- a/test/default/core5.c +++ b/test/default/core5.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "core5" #include "cmptest.h" diff --git a/test/default/core6.c b/test/default/core6.c index 8a986968..1a84988c 100644 --- a/test/default/core6.c +++ b/test/default/core6.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "core6" #include "cmptest.h" diff --git a/test/default/ed25519_convert.c b/test/default/ed25519_convert.c index 9266619f..6d19a029 100644 --- a/test/default/ed25519_convert.c +++ b/test/default/ed25519_convert.c @@ -1,5 +1,3 @@ -#include -#include #define TEST_NAME "ed25519_convert" #include "cmptest.h" diff --git a/test/default/generichash.c b/test/default/generichash.c index 42a4a394..bd98557d 100644 --- a/test/default/generichash.c +++ b/test/default/generichash.c @@ -1,4 +1,3 @@ -#include #include "crypto_uint8.h" diff --git a/test/default/generichash2.c b/test/default/generichash2.c index 4693a5f1..c41c3545 100644 --- a/test/default/generichash2.c +++ b/test/default/generichash2.c @@ -1,4 +1,3 @@ -#include #include "crypto_uint8.h" diff --git a/test/default/generichash3.c b/test/default/generichash3.c index dcd29e06..ab224a2d 100644 --- a/test/default/generichash3.c +++ b/test/default/generichash3.c @@ -1,4 +1,3 @@ -#include #include "crypto_uint8.h" diff --git a/test/default/hash.c b/test/default/hash.c index c24f9c49..39c9923f 100644 --- a/test/default/hash.c +++ b/test/default/hash.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "hash" #include "cmptest.h" diff --git a/test/default/hash3.c b/test/default/hash3.c index 1ecf8973..9d98822d 100644 --- a/test/default/hash3.c +++ b/test/default/hash3.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "hash3" #include "cmptest.h" diff --git a/test/default/onetimeauth.c b/test/default/onetimeauth.c index 78ddf03b..cd5ff926 100644 --- a/test/default/onetimeauth.c +++ b/test/default/onetimeauth.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "onetimeauth" #include "cmptest.h" diff --git a/test/default/onetimeauth2.c b/test/default/onetimeauth2.c index 8c498dfd..0f8296a6 100644 --- a/test/default/onetimeauth2.c +++ b/test/default/onetimeauth2.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "onetimeauth2" #include "cmptest.h" diff --git a/test/default/onetimeauth7.c b/test/default/onetimeauth7.c index a38bbaf4..ee64da19 100644 --- a/test/default/onetimeauth7.c +++ b/test/default/onetimeauth7.c @@ -1,5 +1,4 @@ -#include -#include + #include "windows/windows-quirks.h" #define TEST_NAME "onetimeauth7" diff --git a/test/default/pwhash.c b/test/default/pwhash.c index 7d00902d..708ab6de 100644 --- a/test/default/pwhash.c +++ b/test/default/pwhash.c @@ -1,5 +1,3 @@ -#include -#include #define TEST_NAME "pwhash" #include "cmptest.h" diff --git a/test/default/pwhash_scrypt_ll.c b/test/default/pwhash_scrypt_ll.c index db72e4e9..3fe6b6a3 100644 --- a/test/default/pwhash_scrypt_ll.c +++ b/test/default/pwhash_scrypt_ll.c @@ -1,6 +1,3 @@ -#include -#include -#include #define TEST_NAME "pwhash_scrypt_ll" #include "cmptest.h" diff --git a/test/default/scalarmult.c b/test/default/scalarmult.c index 9b12b638..a7f0ea9a 100644 --- a/test/default/scalarmult.c +++ b/test/default/scalarmult.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "scalarmult" #include "cmptest.h" diff --git a/test/default/scalarmult2.c b/test/default/scalarmult2.c index 7660f670..794af324 100644 --- a/test/default/scalarmult2.c +++ b/test/default/scalarmult2.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "scalarmult2" #include "cmptest.h" diff --git a/test/default/scalarmult5.c b/test/default/scalarmult5.c index 99b2536e..fa4002a6 100644 --- a/test/default/scalarmult5.c +++ b/test/default/scalarmult5.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "scalarmult5" #include "cmptest.h" diff --git a/test/default/scalarmult6.c b/test/default/scalarmult6.c index 092f590f..b18b3933 100644 --- a/test/default/scalarmult6.c +++ b/test/default/scalarmult6.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "scalarmult6" #include "cmptest.h" diff --git a/test/default/secretbox.c b/test/default/secretbox.c index 0a9290dc..f5faf68a 100644 --- a/test/default/secretbox.c +++ b/test/default/secretbox.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "secretbox" #include "cmptest.h" diff --git a/test/default/secretbox2.c b/test/default/secretbox2.c index 6f71f525..6b598c6a 100644 --- a/test/default/secretbox2.c +++ b/test/default/secretbox2.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "secretbox2" #include "cmptest.h" diff --git a/test/default/secretbox7.c b/test/default/secretbox7.c index 337f081b..e76c2686 100644 --- a/test/default/secretbox7.c +++ b/test/default/secretbox7.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "secretbox7" #include "cmptest.h" diff --git a/test/default/secretbox8.c b/test/default/secretbox8.c index 94808dc9..77557ee4 100644 --- a/test/default/secretbox8.c +++ b/test/default/secretbox8.c @@ -1,5 +1,4 @@ -#include -#include + #include "windows/windows-quirks.h" #define TEST_NAME "secretbox8" diff --git a/test/default/secretbox_easy.c b/test/default/secretbox_easy.c index dc3f3bd9..0ce7b0c4 100644 --- a/test/default/secretbox_easy.c +++ b/test/default/secretbox_easy.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "secretbox_easy" #include "cmptest.h" diff --git a/test/default/secretbox_easy2.c b/test/default/secretbox_easy2.c index 63105b64..1f5c7ebc 100644 --- a/test/default/secretbox_easy2.c +++ b/test/default/secretbox_easy2.c @@ -1,5 +1,3 @@ -#include -#include #define TEST_NAME "secretbox_easy2" #include "cmptest.h" diff --git a/test/default/shorthash.c b/test/default/shorthash.c index 6f1d7f3c..7ae174a7 100644 --- a/test/default/shorthash.c +++ b/test/default/shorthash.c @@ -1,4 +1,3 @@ -#include #include "crypto_uint8.h" diff --git a/test/default/sign.c b/test/default/sign.c index 1dc347f0..0208b7fe 100644 --- a/test/default/sign.c +++ b/test/default/sign.c @@ -1,5 +1,3 @@ -#include -#include #define TEST_NAME "sign" #include "cmptest.h" diff --git a/test/default/sodium_core.c b/test/default/sodium_core.c index 7bdcca8f..c100d03a 100644 --- a/test/default/sodium_core.c +++ b/test/default/sodium_core.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "sodium_core" #include "cmptest.h" diff --git a/test/default/sodium_utils.c b/test/default/sodium_utils.c index e50de241..101116db 100644 --- a/test/default/sodium_utils.c +++ b/test/default/sodium_utils.c @@ -1,5 +1,3 @@ -#include -#include #define TEST_NAME "sodium_utils" #include "cmptest.h" diff --git a/test/default/sodium_utils2.c b/test/default/sodium_utils2.c index 3555d0b3..67499390 100644 --- a/test/default/sodium_utils2.c +++ b/test/default/sodium_utils2.c @@ -3,9 +3,6 @@ #include #include -#include -#include -#include #define TEST_NAME "sodium_utils2" #include "cmptest.h" diff --git a/test/default/sodium_utils3.c b/test/default/sodium_utils3.c index d9f1ab68..19f4150a 100644 --- a/test/default/sodium_utils3.c +++ b/test/default/sodium_utils3.c @@ -3,9 +3,6 @@ #include #include -#include -#include -#include #define TEST_NAME "sodium_utils3" #include "cmptest.h" diff --git a/test/default/sodium_version.c b/test/default/sodium_version.c index 0b63d38e..541e8039 100644 --- a/test/default/sodium_version.c +++ b/test/default/sodium_version.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "sodium_version" #include "cmptest.h" diff --git a/test/default/stream.c b/test/default/stream.c index a74d4567..55d01a52 100644 --- a/test/default/stream.c +++ b/test/default/stream.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "stream" #include "cmptest.h" diff --git a/test/default/stream2.c b/test/default/stream2.c index 25cdb352..d36bcfbf 100644 --- a/test/default/stream2.c +++ b/test/default/stream2.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "stream2" #include "cmptest.h" diff --git a/test/default/stream3.c b/test/default/stream3.c index 6e403d91..5a5a841a 100644 --- a/test/default/stream3.c +++ b/test/default/stream3.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "stream3" #include "cmptest.h" diff --git a/test/default/stream4.c b/test/default/stream4.c index 3ac9c86f..b6247a05 100644 --- a/test/default/stream4.c +++ b/test/default/stream4.c @@ -1,4 +1,3 @@ -#include #define TEST_NAME "stream4" #include "cmptest.h" diff --git a/test/default/verify1.c b/test/default/verify1.c index def6421c..23a64174 100644 --- a/test/default/verify1.c +++ b/test/default/verify1.c @@ -1,5 +1,3 @@ -#include -#include #define TEST_NAME "verify1" #include "cmptest.h"