wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7891 from SparkiDev/test_fixes_2

Browse Source 
Test fixes
This commit is contained in:
Daniel Pouzzner
2024-08-23 21:08:44 -05:00
committed by GitHub
parent a39f521f7f 56adefcdc5
commit 1d34b565fa
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/api.c
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()));
@ -82535,7 +82535,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;
@ -82609,7 +82615,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

2
wolfcrypt/src/sp_int.c
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;
} }

2
wolfssl/wolfcrypt/ge_operations.h
View File

@ -112,7 +112,6 @@ typedef struct {
ge Z; ge Z;
ge T2d; ge T2d;
} ge_cached; } ge_cached;
#endif /* !ED25519_SMALL */
#ifdef CURVED25519_ASM #ifdef CURVED25519_ASM
void ge_p1p1_to_p2(ge_p2 *r, const ge_p1p1 *p); void ge_p1p1_to_p2(ge_p2 *r, const ge_p1p1 *p);
@ -124,6 +123,7 @@ void ge_msub(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q);
void ge_add(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q); void ge_add(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q);
void ge_sub(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q); void ge_sub(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q);
#endif #endif
#endif /* !ED25519_SMALL */
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */