Test fixes

api.c:
	Update #ifdefs.
sp_int.c:
	Fix free call when hardening is disabled.
This commit is contained in:
Sean Parkinson
2024-08-22 16:09:22 +10:00
parent e99bbf9429
commit 08d8a74992
2 changed files with 11 additions and 6 deletions

View File

@@ -59747,9 +59747,9 @@ static int test_wolfSSL_SESSION(void)
/* TLS v1.3 requires session tickets */ /* TLS v1.3 requires session tickets */
/* CHACHA and POLY1305 required for myTicketEncCb */ /* CHACHA and POLY1305 required for myTicketEncCb */
#if defined(WOLFSSL_TLS13) && (!defined(HAVE_SESSION_TICKET) && \ #if !defined(WOLFSSL_NO_TLS12) && (!defined(WOLFSSL_TLS13) || \
!defined(WOLFSSL_NO_TLS12) || !(defined(HAVE_CHACHA) && \ !(defined(HAVE_SESSION_TICKET) && ((defined(HAVE_CHACHA) && \
defined(HAVE_POLY1305) && !defined(HAVE_AESGCM))) defined(HAVE_POLY1305)) || defined(HAVE_AESGCM))))
ExpectNotNull(ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())); ExpectNotNull(ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method()));
#else #else
ExpectNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); ExpectNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
@@ -82532,7 +82532,13 @@ static int test_dtls13_bad_epoch_ch(void)
} }
#endif #endif
#if defined(HAVE_SSL_MEMIO_TESTS_DEPENDENCIES) && !defined(NO_SESSION_CACHE) #if ((defined(WOLFSSL_TLS13) && !defined(WOLFSSL_NO_DEF_TICKET_ENC_CB) && \
defined(HAVE_SESSION_TICKET) && defined(WOLFSSL_TICKET_HAVE_ID) && \
!defined(WOLFSSL_TLS13_MIDDLEBOX_COMPAT)) || \
(!defined(NO_OLD_TLS) && ((!defined(NO_AES) && !defined(NO_AES_CBC)) || \
!defined(NO_DES3))) || !defined(WOLFSSL_NO_TLS12)) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER) && \
defined(HAVE_SSL_MEMIO_TESTS_DEPENDENCIES) && !defined(NO_SESSION_CACHE)
static int test_short_session_id_ssl_ready(WOLFSSL* ssl) static int test_short_session_id_ssl_ready(WOLFSSL* ssl)
{ {
EXPECT_DECLS; EXPECT_DECLS;
@@ -82606,7 +82612,6 @@ static int test_short_session_id(void)
ExpectIntEQ(test_wolfSSL_client_server_nofail_memio(&client_cbf, ExpectIntEQ(test_wolfSSL_client_server_nofail_memio(&client_cbf,
&server_cbf, NULL), TEST_SUCCESS); &server_cbf, NULL), TEST_SUCCESS);
} }
return EXPECT_RESULT(); return EXPECT_RESULT();
} }
#else #else

View File

@@ -13655,7 +13655,7 @@ static int _sp_exptmod_base_2(const sp_int* e, int digits, const sp_int* m,
#ifndef WC_NO_HARDEN #ifndef WC_NO_HARDEN
FREE_SP_INT_ARRAY(d, NULL); FREE_SP_INT_ARRAY(d, NULL);
#else #else
FREE_SP_INT(tr, m->used * 2 + 1); FREE_SP_INT(tr, NULL);
#endif #endif
return err; return err;
} }