Skip to content

Commit bcc65a0

Browse files
committed
wolfcrypt/test/test.c: harmonize gating for hpke_test() and berder_test(), so that --enable-all-crypto passes -DWOLFCRYPT_TEST_LINT.
1 parent b5475f3 commit bcc65a0

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

wolfcrypt/test/test.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,9 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sshkdf_test(void);
561561
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t tls13_kdf_test(void);
562562
#endif
563563
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t x963kdf_test(void);
564+
#if defined(HAVE_HPKE) && defined(HAVE_ECC) && defined(HAVE_AESGCM)
564565
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hpke_test(void);
566+
#endif
565567
#ifdef WC_SRTP_KDF
566568
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t srtpkdf_test(void);
567569
#endif
@@ -738,7 +740,9 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t mp_test(void);
738740
#if defined(WOLFSSL_PUBLIC_MP) && defined(WOLFSSL_KEY_GEN)
739741
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t prime_test(void);
740742
#endif
741-
#ifdef ASN_BER_TO_DER
743+
#if defined(ASN_BER_TO_DER) && \
744+
(defined(WOLFSSL_TEST_CERT) || defined(OPENSSL_EXTRA) || \
745+
defined(OPENSSL_EXTRA_X509_SMALL))
742746
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t berder_test(void);
743747
#endif
744748
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t logging_test(void);
@@ -56960,7 +56964,9 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t prime_test(void)
5696056964
#endif /* WOLFSSL_PUBLIC_MP */
5696156965

5696256966

56963-
#ifdef ASN_BER_TO_DER
56967+
#if defined(ASN_BER_TO_DER) && \
56968+
(defined(WOLFSSL_TEST_CERT) || defined(OPENSSL_EXTRA) || \
56969+
defined(OPENSSL_EXTRA_X509_SMALL))
5696456970
/* wc_BerToDer is only public facing in the case of test cert or opensslextra */
5696556971
typedef struct berDerTestData {
5696656972
const byte *in;
@@ -57076,7 +57082,8 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t berder_test(void)
5707657082

5707757083
return 0;
5707857084
}
57079-
#endif /* ASN_BER_TO_DER */
57085+
#endif /* ASN_BER_TO_DER && (WOLFSSL_TEST_CERT || OPENSSL_EXTRA ||
57086+
OPENSSL_EXTRA_X509_SMALL */
5708057087

5708157088
#ifdef DEBUG_WOLFSSL
5708257089
static THREAD_LS_T int log_cnt = 0;

0 commit comments

Comments
 (0)