Skip to content

Commit b5475f3

Browse files
committed
wolfcrypt/test/test.c: add WOLFSSL_WOLFCRYPT_TEST_LINT, allowing testing for -Wunused-function in enable-all configurations. No functional changes, but several missing or inconsistent gates fixed.
1 parent 8b2a26a commit b5475f3

1 file changed

Lines changed: 18 additions & 7 deletions

File tree

wolfcrypt/test/test.c

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -491,12 +491,16 @@ typedef struct testVector {
491491
size_t outLen;
492492
} testVector;
493493

494-
#ifndef WOLFSSL_TEST_SUBROUTINE
495-
#define WOLFSSL_TEST_SUBROUTINE
494+
#ifdef WOLFCRYPT_TEST_LINT
495+
#define WOLFSSL_TEST_SUBROUTINE static
496+
#else
497+
PRAGMA_GCC("GCC diagnostic ignored \"-Wunused-function\"")
498+
PRAGMA_CLANG("clang diagnostic ignored \"-Wunused-function\"")
496499
#endif
497500

498-
PRAGMA_GCC("GCC diagnostic ignored \"-Wunused-function\"")
499-
PRAGMA_CLANG("clang diagnostic ignored \"-Wunused-function\"")
501+
#ifndef WOLFSSL_TEST_SUBROUTINE
502+
#define WOLFSSL_TEST_SUBROUTINE
503+
#endif
500504

501505
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t error_test(void);
502506
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t base64_test(void);
@@ -521,7 +525,9 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha384_test(void);
521525
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha3_test(void);
522526
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t shake128_test(void);
523527
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t shake256_test(void);
528+
#ifdef WOLFSSL_SM3
524529
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sm3_test(void);
530+
#endif
525531
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hash_test(void);
526532
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hmac_md5_test(void);
527533
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hmac_sha_test(void);
@@ -606,7 +612,12 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t srp_test(void);
606612
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t random_test(void);
607613
#endif /* WC_NO_RNG */
608614
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t pwdbased_test(void);
615+
#if defined(USE_CERT_BUFFERS_2048) && \
616+
defined(HAVE_PKCS12) && \
617+
!defined(NO_ASN) && !defined(NO_PWDBASED) && !defined(NO_HMAC) && \
618+
!defined(NO_CERTS) && !defined(NO_DES3)
609619
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t pkcs12_test(void);
620+
#endif
610621
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t ripemd_test(void);
611622
#if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY)
612623
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t openssl_test(void); /* test mini api */
@@ -711,7 +722,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t scrypt_test(void);
711722
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t cert_test(void);
712723
#endif
713724
#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) && \
714-
!defined(NO_FILESYSTEM) && defined(WOLFSSL_CERT_GEN)
725+
!defined(NO_FILESYSTEM) && !defined(NO_RSA) && defined(WOLFSSL_GEN_CERT)
715726
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t certext_test(void);
716727
#endif
717728
#if defined(WOLFSSL_CERT_GEN_CACHE) && defined(WOLFSSL_TEST_CERT) && \
@@ -18638,7 +18649,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t cert_test(void)
1863818649
#endif /* WOLFSSL_TEST_CERT */
1863918650

1864018651
#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) && \
18641-
!defined(NO_FILESYSTEM) && defined(WOLFSSL_CERT_GEN)
18652+
!defined(NO_FILESYSTEM) && !defined(NO_RSA) && defined(WOLFSSL_GEN_CERT)
1864218653
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t certext_test(void)
1864318654
{
1864418655
DecodedCert cert;
@@ -18836,7 +18847,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t certext_test(void)
1883618847
return 0;
1883718848
}
1883818849
#endif /* WOLFSSL_CERT_EXT && WOLFSSL_TEST_CERT &&
18839-
!NO_FILESYSTEM && WOLFSSL_CERT_GEN */
18850+
!NO_FILESYSTEM && !NO_RSA && WOLFSSL_CERT_GEN */
1884018851

1884118852
#if defined(WOLFSSL_CERT_GEN_CACHE) && defined(WOLFSSL_TEST_CERT) && \
1884218853
defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_CERT_GEN)

0 commit comments

Comments
 (0)