Introduce LTC_NOP_TEST()

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>

tests/argon2_test.c

@@ -76,10 +76,5 @@ int argon2_test(void)
 }
 
 #else
-
-int argon2_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(argon2_test)
 #endif

tests/bcrypt_test.c

@@ -136,11 +136,5 @@ int bcrypt_test(void)
 }
 
 #else
-
-
-int bcrypt_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(bcrypt_test)
 #endif

tests/common.c

@@ -9,6 +9,8 @@
   Steffen Jaeckel
 */
 
+LTC_NOP_TEST(nop_test)
+
 void run_cmd(int res, int line, const char *file, const char *cmd, const char *algorithm)
 {
    if (res != CRYPT_OK) {

tests/common.h

@@ -50,6 +50,9 @@ typedef void (*dir_cleanup_cb)(void* ctx);
 int test_process_dir(const char *path, void *ctx, dir_iter_cb iter, dir_fiter_cb fiter, dir_cleanup_cb cleanup, const char *test);
 #endif
 
+int ltc_test_nop(void);
+#define LTC_NOP_TEST(n) int n(void) { return CRYPT_NOP; }
+
 void run_cmd(int res, int line, const char *file, const char *cmd, const char *algorithm);
 
 void print_hex(const char* what, const void* v, const unsigned long l);

tests/der_test.c

@@ -3,12 +3,7 @@
 #include <tomcrypt_test.h>
 
 #if !defined(LTC_DER)
-
-int der_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(der_test)
 #else
 
 #include <wchar.h>

tests/dh_test.c

@@ -397,10 +397,5 @@ int dh_test(void)
 }
 
 #else
-
-int dh_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(dh_test)
 #endif

tests/dsa_test.c

@@ -385,10 +385,5 @@ int dsa_test(void)
 }
 
 #else
-
-int dsa_test(void)
-{
-  return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(dsa_test)
 #endif

tests/ecc_test.c

@@ -2459,8 +2459,5 @@ int ecc_test(void)
    return CRYPT_OK;
 }
 #else
-int ecc_test(void)
-{
-   return CRYPT_NOP;
-}
+LTC_NOP_TEST(ecc_test)
 #endif

tests/ed25519_test.c

@@ -468,10 +468,5 @@ int ed25519_test(void)
 }
 
 #else
-
-int ed25519_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(ed25519_test)
 #endif

tests/ed448_test.c

@@ -476,10 +476,5 @@ int ed448_test(void)
 }
 
 #else
-
-int ed448_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(ed448_test)
 #endif

tests/mpi_test.c

@@ -137,8 +137,5 @@ int mpi_test(void)
    return s_radix_to_bin_test();
 }
 #else
-int mpi_test(void)
-{
-   return CRYPT_NOP;
-}
+LTC_NOP_TEST(mpi_test)
 #endif

tests/pem_test.c

@@ -202,10 +202,5 @@ int pem_test(void)
 }
 
 #else
-
-int pem_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(pem_test)
 #endif

tests/pkcs_1_eme_test.c

@@ -59,11 +59,6 @@ int pkcs_1_eme_test(void)
 }
 
 #else
-
-int pkcs_1_eme_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(pkcs_1_eme_test)
 #endif
 

tests/pkcs_1_emsa_test.c

@@ -56,11 +56,6 @@ int pkcs_1_emsa_test(void)
 }
 
 #else
-
-int pkcs_1_emsa_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(pkcs_1_emsa_test)
 #endif
 

tests/pkcs_1_oaep_test.c

@@ -62,11 +62,6 @@ int pkcs_1_oaep_test(void)
 }
 
 #else
-
-int pkcs_1_oaep_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(pkcs_1_oaep_test)
 #endif
 

tests/pkcs_1_pss_test.c

@@ -66,11 +66,6 @@ int pkcs_1_pss_test(void)
 }
 
 #else
-
-int pkcs_1_pss_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(pkcs_1_pss_test)
 #endif
 

tests/pkcs_1_test.c

@@ -79,11 +79,6 @@ int pkcs_1_test(void)
 }
 
 #else
-
-int pkcs_1_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(pkcs_1_test)
 #endif
 

tests/rsa_test.c

@@ -879,10 +879,5 @@ print_hex("q", tmp, len);
 }
 
 #else
-
-int rsa_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(rsa_test)
 #endif

tests/scrypt_test.c

@@ -97,10 +97,5 @@ int scrypt_test(void)
 }
 
 #else
-
-int scrypt_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(scrypt_test)
 #endif

tests/siv_wycheproof_test.c

@@ -95,5 +95,5 @@ int siv_wycheproof_test(void)
 }
 
 #else
-int siv_wycheproof_test(void) { return CRYPT_NOP; }
+LTC_NOP_TEST(siv_wycheproof_test)
 #endif

tests/ssh_test.c

@@ -347,10 +347,7 @@ int ssh_test(void)
 
 #else
 
-int ssh_test(void)
-{
-   return CRYPT_NOP;
-}
+LTC_NOP_TEST(ssh_test)
 
 #endif
 

tests/test.c

@@ -40,6 +40,7 @@ static const test_function test_functions[] =
       LTC_TEST_FN(multi_test),
       LTC_TEST_FN(pem_test),
       LTC_TEST_FN(deprecated_test),
+      LTC_TEST_FN(nop_test),
       /* keep the prng_test always at the end as
        * it has to be handled specially when
        * testing with LTC_PTHREAD enabled

tests/tomcrypt_test.h

@@ -51,6 +51,7 @@ int scrypt_test(void);
 int no_null_termination_check_test(void);
 int pk_oid_test(void);
 int deprecated_test(void);
+int nop_test(void);
 
 #ifdef LTC_PKCS_1
 struct ltc_prng_descriptor* no_prng_desc_get(void);

tests/x25519_test.c

@@ -248,10 +248,5 @@ int x25519_test(void)
 }
 
 #else
-
-int x25519_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(x25519_test)
 #endif

tests/x448_test.c

@@ -240,10 +240,5 @@ int x448_test(void)
 }
 
 #else
-
-int x448_test(void)
-{
-   return CRYPT_NOP;
-}
-
+LTC_NOP_TEST(x448_test)
 #endif