mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-24 19:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use correct test case conditionals for helper functions in tests/suites

Browse Source 
Fix unused-function errors.

Signed-off-by: Michael Schuster <michael@schuster.ms>
This commit is contained in:
Michael Schuster 2024-06-07 01:51:54 +02:00 committed by Minos Galanakis
parent 8f606551d7
commit a3cc46382b
7 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/suites/test_suite_x509parse.function
View File

@ -60,6 +60,9 @@ const mbedtls_x509_crt_profile profile_sha512 =
1024, 1024,
}; };
#if defined(MBEDTLS_X509_CRT_PARSE_C)
#if defined(MBEDTLS_FS_IO)
static int verify_none(void *data, mbedtls_x509_crt *crt, int certificate_depth, uint32_t *flags) static int verify_none(void *data, mbedtls_x509_crt *crt, int certificate_depth, uint32_t *flags)
{ {
((void) data); ((void) data);
@ -80,7 +83,8 @@ static int verify_all(void *data, mbedtls_x509_crt *crt, int certificate_depth,
return 0; return 0;
} }
#if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK) #if defined(MBEDTLS_X509_CRL_PARSE_C) && \
defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK)
static int ca_callback_fail(void *data, mbedtls_x509_crt const *child, mbedtls_x509_crt **candidates) static int ca_callback_fail(void *data, mbedtls_x509_crt const *child, mbedtls_x509_crt **candidates)
{ {
((void) data); ((void) data);
@ -89,7 +93,7 @@ static int ca_callback_fail(void *data, mbedtls_x509_crt const *child, mbedtls_x
return -1; return -1;
} }
#if defined(MBEDTLS_X509_CRT_PARSE_C)
static int ca_callback(void *data, mbedtls_x509_crt const *child, static int ca_callback(void *data, mbedtls_x509_crt const *child,
mbedtls_x509_crt **candidates) mbedtls_x509_crt **candidates)
{ {
@ -138,8 +142,7 @@ exit:
*candidates = first; *candidates = first;
return ret; return ret;
} }
#endif /* MBEDTLS_X509_CRT_PARSE_C */ #endif /* MBEDTLS_X509_CRL_PARSE_C && MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK */
#endif /* MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK */
static int verify_fatal(void *data, mbedtls_x509_crt *crt, int certificate_depth, uint32_t *flags) static int verify_fatal(void *data, mbedtls_x509_crt *crt, int certificate_depth, uint32_t *flags)
{ {
@ -186,7 +189,6 @@ done:
return ret; return ret;
} }
#if defined(MBEDTLS_X509_CRT_PARSE_C)
typedef struct { typedef struct {
char buf[512]; char buf[512];
char *p; char *p;
@ -316,6 +318,7 @@ static int verify_parse_san(mbedtls_x509_subject_alternative_name *san,
return 0; return 0;
} }
#endif /* MBEDTLS_FS_IO */
static int parse_crt_ext_cb(void *p_ctx, mbedtls_x509_crt const *crt, mbedtls_x509_buf const *oid, static int parse_crt_ext_cb(void *p_ctx, mbedtls_x509_crt const *crt, mbedtls_x509_buf const *oid,
int critical, const unsigned char *cp, const unsigned char *end) int critical, const unsigned char *cp, const unsigned char *end)
@ -416,7 +419,8 @@ static int parse_crt_ext_cb(void *p_ctx, mbedtls_x509_crt const *crt, mbedtls_x5
} }
#endif /* MBEDTLS_X509_CRT_PARSE_C */ #endif /* MBEDTLS_X509_CRT_PARSE_C */
#if defined(MBEDTLS_X509_CSR_PARSE_C) #if defined(MBEDTLS_X509_CSR_PARSE_C) && \
!defined(MBEDTLS_X509_REMOVE_INFO)
static int parse_csr_ext_accept_cb(void *p_ctx, mbedtls_x509_csr const *csr, mbedtls_x509_buf const *oid, static int parse_csr_ext_accept_cb(void *p_ctx, mbedtls_x509_csr const *csr, mbedtls_x509_buf const *oid,
int critical, const unsigned char *cp, const unsigned char *end) int critical, const unsigned char *cp, const unsigned char *end)
{ {
@ -443,7 +447,7 @@ static int parse_csr_ext_reject_cb(void *p_ctx, mbedtls_x509_csr const *csr, mbe
return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_X509_INVALID_EXTENSIONS, return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_X509_INVALID_EXTENSIONS,
MBEDTLS_ERR_ASN1_UNEXPECTED_TAG); MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
} }
#endif /* MBEDTLS_X509_CSR_PARSE_C */ #endif /* MBEDTLS_X509_CSR_PARSE_C && !MBEDTLS_X509_REMOVE_INFO */
/* END_HEADER */ /* END_HEADER */
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */ /* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */

8
tests/suites/test_suite_x509write.function
View File

@ -10,7 +10,11 @@
#include "mbedtls/pk.h" #include "mbedtls/pk.h"
#include "mbedtls/psa_util.h" #include "mbedtls/psa_util.h"
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_PEM_WRITE_C) && \
defined(MBEDTLS_X509_CRT_WRITE_C) && \
defined(MBEDTLS_X509_CRT_PARSE_C) && \
defined(MBEDTLS_MD_CAN_SHA1) && \
defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
static int mbedtls_rsa_decrypt_func(void *ctx, size_t *olen, static int mbedtls_rsa_decrypt_func(void *ctx, size_t *olen,
const unsigned char *input, unsigned char *output, const unsigned char *input, unsigned char *output,
size_t output_max_len) size_t output_max_len)
@ -30,7 +34,7 @@ static size_t mbedtls_rsa_key_len_func(void *ctx)
{ {
return ((const mbedtls_rsa_context *) ctx)->len; return ((const mbedtls_rsa_context *) ctx)->len;
} }
#endif /* MBEDTLS_RSA_C */ #endif
#if defined(MBEDTLS_USE_PSA_CRYPTO) && \ #if defined(MBEDTLS_USE_PSA_CRYPTO) && \
defined(MBEDTLS_PEM_WRITE_C) && defined(MBEDTLS_X509_CSR_WRITE_C) defined(MBEDTLS_PEM_WRITE_C) && defined(MBEDTLS_X509_CSR_WRITE_C)

2
tf-psa-crypto/tests/suites/test_suite_bignum.function
View File

@ -32,6 +32,7 @@ static int sign_is_valid(const mbedtls_mpi *X)
return 1; return 1;
} }
#if defined(MBEDTLS_GENPRIME)
typedef struct mbedtls_test_mpi_random { typedef struct mbedtls_test_mpi_random {
data_t *data; data_t *data;
size_t pos; size_t pos;
@ -73,6 +74,7 @@ static int mbedtls_test_mpi_miller_rabin_determinizer(void *state,
return 0; return 0;
} }
#endif /* MBEDTLS_GENPRIME */
/* Random generator that is told how many bytes to return. */ /* Random generator that is told how many bytes to return. */
static int f_rng_bytes_left(void *state, unsigned char *buf, size_t len) static int f_rng_bytes_left(void *state, unsigned char *buf, size_t len)

7
tf-psa-crypto/tests/suites/test_suite_entropy.function
View File

@ -60,6 +60,8 @@ static void entropy_clear_sources(mbedtls_entropy_context *ctx)
} }
#if defined(MBEDTLS_ENTROPY_NV_SEED) #if defined(MBEDTLS_ENTROPY_NV_SEED)
#if defined(MBEDTLS_MD_LIGHT) && defined(MBEDTLS_PLATFORM_NV_SEED_ALT)
/* /*
* NV seed read/write functions that use a buffer instead of a file * NV seed read/write functions that use a buffer instead of a file
*/ */
@ -84,7 +86,9 @@ static int buffer_nv_seed_write(unsigned char *buf, size_t buf_len)
memcpy(buffer_seed, buf, MBEDTLS_ENTROPY_BLOCK_SIZE); memcpy(buffer_seed, buf, MBEDTLS_ENTROPY_BLOCK_SIZE);
return 0; return 0;
} }
#endif /* MBEDTLS_MD_LIGHT && MBEDTLS_PLATFORM_NV_SEED_ALT */
#if defined(MBEDTLS_FS_IO)
/* /*
* NV seed read/write helpers that fill the base seedfile * NV seed read/write helpers that fill the base seedfile
*/ */
@ -111,6 +115,7 @@ static int write_nv_seed(unsigned char *buf, size_t buf_len)
return 0; return 0;
} }
#if defined(MBEDTLS_PLATFORM_NV_SEED_ALT)
static int read_nv_seed(unsigned char *buf, size_t buf_len) static int read_nv_seed(unsigned char *buf, size_t buf_len)
{ {
FILE *f; FILE *f;
@ -133,6 +138,8 @@ static int read_nv_seed(unsigned char *buf, size_t buf_len)
return 0; return 0;
} }
#endif /* MBEDTLS_PLATFORM_NV_SEED_ALT */
#endif /* MBEDTLS_FS_IO */
#endif /* MBEDTLS_ENTROPY_NV_SEED */ #endif /* MBEDTLS_ENTROPY_NV_SEED */
/* END_HEADER */ /* END_HEADER */

4
tf-psa-crypto/tests/suites/test_suite_lmots.function
View File

@ -2,7 +2,7 @@
#include "lmots.h" #include "lmots.h"
#include "mbedtls/lms.h" #include "mbedtls/lms.h"
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_LMS_PRIVATE)
static int check_lmots_private_key_for_leak(unsigned char *sig) static int check_lmots_private_key_for_leak(unsigned char *sig)
{ {
size_t idx; size_t idx;
@ -18,7 +18,7 @@ static int check_lmots_private_key_for_leak(unsigned char *sig)
exit: exit:
return -1; return -1;
} }
#endif /* defined(MBEDTLS_TEST_HOOKS) */ #endif /* MBEDTLS_TEST_HOOKS && MBEDTLS_LMS_PRIVATE */
/* END_HEADER */ /* END_HEADER */

4
tf-psa-crypto/tests/suites/test_suite_pk.function
View File

@ -467,7 +467,7 @@ exit:
} }
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */ #endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
static int mbedtls_rsa_decrypt_func(void *ctx, size_t *olen, static int mbedtls_rsa_decrypt_func(void *ctx, size_t *olen,
const unsigned char *input, unsigned char *output, const unsigned char *input, unsigned char *output,
size_t output_max_len) size_t output_max_len)
@ -491,7 +491,7 @@ static size_t mbedtls_rsa_key_len_func(void *ctx)
{ {
return ((const mbedtls_rsa_context *) ctx)->len; return ((const mbedtls_rsa_context *) ctx)->len;
} }
#endif /* MBEDTLS_RSA_C */ #endif /* MBEDTLS_RSA_C && MBEDTLS_PK_RSA_ALT_SUPPORT */
typedef enum { typedef enum {
/* The values are compatible with thinking of "from pair" as a boolean. */ /* The values are compatible with thinking of "from pair" as a boolean. */

2
tf-psa-crypto/tests/suites/test_suite_psa_crypto.function
View File

@ -1292,6 +1292,7 @@ exit:
#if defined(MBEDTLS_THREADING_PTHREAD) #if defined(MBEDTLS_THREADING_PTHREAD)
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
typedef struct same_key_context { typedef struct same_key_context {
data_t *data; data_t *data;
mbedtls_svc_key_id_t key; mbedtls_svc_key_id_t key;
@ -1410,6 +1411,7 @@ static void *thread_use_and_destroy_key(void *ctx)
exit: exit:
return NULL; return NULL;
} }
#endif /* MBEDTLS_PSA_CRYPTO_STORAGE_C */
typedef struct generate_key_context { typedef struct generate_key_context {
psa_key_type_t type; psa_key_type_t type;