Include header files commonly used by the tests to cmptest.h

test/default/aead_chacha20poly1305.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
 
 #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;
 }

test/default/auth.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #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;
 }

test/default/auth2.c

@@ -1,7 +1,5 @@
 /* "Test Case AUTH256-4" from RFC 4868 */
 
-#include <stdio.h>
-
 #define TEST_NAME "auth2"
 #include "cmptest.h"
 

test/default/auth3.c

@@ -1,7 +1,5 @@
 /* "Test Case AUTH256-4" from RFC 4868 */
 
-#include <stdio.h>
-
 #define TEST_NAME "auth3"
 #include "cmptest.h"
 

test/default/auth5.c

@@ -1,5 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
+
 #include "windows/windows-quirks.h"
 
 #define TEST_NAME "auth5"

test/default/auth6.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "auth6"
 #include "cmptest.h"

test/default/auth7.c

@@ -1,5 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
+
 #include "windows/windows-quirks.h"
 
 #define TEST_NAME "auth7"

test/default/box.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "box"
 #include "cmptest.h"

test/default/box2.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "box2"
 #include "cmptest.h"

test/default/box7.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "box7"
 #include "cmptest.h"

test/default/box8.c

@@ -1,5 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
+
 #include "windows/windows-quirks.h"
 
 #define TEST_NAME "box8"

test/default/box_easy.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "box_easy"
 #include "cmptest.h"

test/default/box_easy2.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "box_easy2"
 #include "cmptest.h"

test/default/box_seed.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "box_seed"
 #include "cmptest.h"

test/default/chacha20.c

@@ -1,7 +1,4 @@
 
-#include <stdio.h>
-#include <string.h>
-
 #define TEST_NAME "chacha20"
 #include "cmptest.h"
 

test/default/cmptest.h

@@ -2,7 +2,11 @@
 #ifndef __CMPTEST_H__
 #define __CMPTEST_H__
 
+#include <assert.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "sodium.h"
 

test/default/core1.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "core1"
 #include "cmptest.h"

test/default/core2.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "core2"
 #include "cmptest.h"

test/default/core3.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "core3"
 #include "cmptest.h"

test/default/core4.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "core4"
 #include "cmptest.h"

test/default/core5.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "core5"
 #include "cmptest.h"

test/default/core6.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "core6"
 #include "cmptest.h"

test/default/ed25519_convert.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "ed25519_convert"
 #include "cmptest.h"

test/default/generichash.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #include "crypto_uint8.h"
 

test/default/generichash2.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #include "crypto_uint8.h"
 

test/default/generichash3.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #include "crypto_uint8.h"
 

test/default/hash.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "hash"
 #include "cmptest.h"

test/default/hash3.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "hash3"
 #include "cmptest.h"

test/default/onetimeauth.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "onetimeauth"
 #include "cmptest.h"

test/default/onetimeauth2.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "onetimeauth2"
 #include "cmptest.h"

test/default/onetimeauth7.c

@@ -1,5 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
+
 #include "windows/windows-quirks.h"
 
 #define TEST_NAME "onetimeauth7"

test/default/pwhash.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "pwhash"
 #include "cmptest.h"

test/default/pwhash_scrypt_ll.c

@@ -1,6 +1,3 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
 
 #define TEST_NAME "pwhash_scrypt_ll"
 #include "cmptest.h"

test/default/scalarmult.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "scalarmult"
 #include "cmptest.h"

test/default/scalarmult2.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "scalarmult2"
 #include "cmptest.h"

test/default/scalarmult5.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "scalarmult5"
 #include "cmptest.h"

test/default/scalarmult6.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "scalarmult6"
 #include "cmptest.h"

test/default/secretbox.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "secretbox"
 #include "cmptest.h"

test/default/secretbox2.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "secretbox2"
 #include "cmptest.h"

test/default/secretbox7.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "secretbox7"
 #include "cmptest.h"

test/default/secretbox8.c

@@ -1,5 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
+
 #include "windows/windows-quirks.h"
 
 #define TEST_NAME "secretbox8"

test/default/secretbox_easy.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "secretbox_easy"
 #include "cmptest.h"

test/default/secretbox_easy2.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "secretbox_easy2"
 #include "cmptest.h"

test/default/shorthash.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #include "crypto_uint8.h"
 

test/default/sign.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "sign"
 #include "cmptest.h"

test/default/sodium_core.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "sodium_core"
 #include "cmptest.h"

test/default/sodium_utils.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "sodium_utils"
 #include "cmptest.h"

test/default/sodium_utils2.c

@@ -3,9 +3,6 @@
 
 #include <limits.h>
 #include <signal.h>
-#include <string.h>
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "sodium_utils2"
 #include "cmptest.h"

test/default/sodium_utils3.c

@@ -3,9 +3,6 @@
 
 #include <limits.h>
 #include <signal.h>
-#include <string.h>
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "sodium_utils3"
 #include "cmptest.h"

test/default/sodium_version.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "sodium_version"
 #include "cmptest.h"

test/default/stream.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "stream"
 #include "cmptest.h"

test/default/stream2.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "stream2"
 #include "cmptest.h"

test/default/stream3.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "stream3"
 #include "cmptest.h"

test/default/stream4.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 
 #define TEST_NAME "stream4"
 #include "cmptest.h"

test/default/verify1.c

@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "verify1"
 #include "cmptest.h"