feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for size increase on X509 small. Fix for CRL test with NO_RSA.

Browse Source
This commit is contained in:
David Garske
2024-11-20 15:54:02 -08:00
parent 96a0619d70
commit 6be70f9230
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@ -22476,7 +22476,7 @@ int SendChangeCipher(WOLFSSL* ssl)
if (ssl->CBIS != NULL) if (ssl->CBIS != NULL)
ssl->CBIS(ssl, WOLFSSL_CB_ACCEPT_LOOP, WOLFSSL_SUCCESS); ssl->CBIS(ssl, WOLFSSL_CB_ACCEPT_LOOP, WOLFSSL_SUCCESS);
} }
else{ else {
ssl->options.clientState = ssl->options.clientState =
CLIENT_CHANGECIPHERSPEC_COMPLETE; CLIENT_CHANGECIPHERSPEC_COMPLETE;
if (ssl->CBIS != NULL) if (ssl->CBIS != NULL)

36
src/ssl.c
View File

@ -19813,20 +19813,6 @@ int wolfssl_get_ex_new_index(int class_index, long ctx_l, void* ctx_ptr,
} }
#endif /* HAVE_EX_DATA_CRYPTO */ #endif /* HAVE_EX_DATA_CRYPTO */
void* wolfSSL_CTX_get_ex_data(const WOLFSSL_CTX* ctx, int idx)
{
WOLFSSL_ENTER("wolfSSL_CTX_get_ex_data");
#ifdef HAVE_EX_DATA
if (ctx != NULL) {
return wolfSSL_CRYPTO_get_ex_data(&ctx->ex_data, idx);
}
#else
(void)ctx;
(void)idx;
#endif
return NULL;
}
#ifdef HAVE_EX_DATA_CRYPTO #ifdef HAVE_EX_DATA_CRYPTO
int wolfSSL_CTX_get_ex_new_index(long idx, void* arg, int wolfSSL_CTX_get_ex_new_index(long idx, void* arg,
WOLFSSL_CRYPTO_EX_new* new_func, WOLFSSL_CRYPTO_EX_new* new_func,
@ -19855,10 +19841,25 @@ int wolfSSL_get_ex_new_index(long argValue, void* arg,
} }
#endif /* HAVE_EX_DATA_CRYPTO */ #endif /* HAVE_EX_DATA_CRYPTO */
#ifdef OPENSSL_EXTRA
void* wolfSSL_CTX_get_ex_data(const WOLFSSL_CTX* ctx, int idx)
{
WOLFSSL_ENTER("wolfSSL_CTX_get_ex_data");
#ifdef HAVE_EX_DATA
if (ctx != NULL) {
return wolfSSL_CRYPTO_get_ex_data(&ctx->ex_data, idx);
}
#else
(void)ctx;
(void)idx;
#endif
return NULL;
}
int wolfSSL_CTX_set_ex_data(WOLFSSL_CTX* ctx, int idx, void* data) int wolfSSL_CTX_set_ex_data(WOLFSSL_CTX* ctx, int idx, void* data)
{ {
WOLFSSL_ENTER("wolfSSL_CTX_set_ex_data"); WOLFSSL_ENTER("wolfSSL_CTX_set_ex_data");
#ifdef HAVE_EX_DATA_CRYPTO #ifdef HAVE_EX_DATA
if (ctx != NULL) { if (ctx != NULL) {
return wolfSSL_CRYPTO_set_ex_data(&ctx->ex_data, idx, data); return wolfSSL_CRYPTO_set_ex_data(&ctx->ex_data, idx, data);
} }
@ -19878,15 +19879,14 @@ int wolfSSL_CTX_set_ex_data_with_cleanup(
wolfSSL_ex_data_cleanup_routine_t cleanup_routine) wolfSSL_ex_data_cleanup_routine_t cleanup_routine)
{ {
WOLFSSL_ENTER("wolfSSL_CTX_set_ex_data_with_cleanup"); WOLFSSL_ENTER("wolfSSL_CTX_set_ex_data_with_cleanup");
if (ctx != NULL) if (ctx != NULL) {
{
return wolfSSL_CRYPTO_set_ex_data_with_cleanup(&ctx->ex_data, idx, data, return wolfSSL_CRYPTO_set_ex_data_with_cleanup(&ctx->ex_data, idx, data,
cleanup_routine); cleanup_routine);
} }
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
#endif /* HAVE_EX_DATA_CLEANUP_HOOKS */ #endif /* HAVE_EX_DATA_CLEANUP_HOOKS */
#endif /* OPENSSL_EXTRA */
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)

4
tests/api.c
View File

@ -85315,8 +85315,8 @@ static int test_wolfSSL_X509_print(void)
static int test_wolfSSL_X509_CRL_print(void) static int test_wolfSSL_X509_CRL_print(void)
{ {
EXPECT_DECLS; EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && defined(HAVE_CRL)\ #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && defined(HAVE_CRL) && \
&& !defined(NO_FILESYSTEM) && defined(XSNPRINTF) !defined(NO_RSA) && !defined(NO_FILESYSTEM) && defined(XSNPRINTF)
X509_CRL* crl = NULL; X509_CRL* crl = NULL;
BIO *bio = NULL; BIO *bio = NULL;
XFILE fp = XBADFILE; XFILE fp = XBADFILE;

2
wolfssl/ssl.h
View File

@ -1519,6 +1519,7 @@ WOLFSSL_API int wolfSSL_X509_get_ex_new_index(int idx, void *arg,
#endif #endif
#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */ #endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */
#ifdef OPENSSL_EXTRA
WOLFSSL_API void* wolfSSL_CTX_get_ex_data(const WOLFSSL_CTX* ctx, int idx); WOLFSSL_API void* wolfSSL_CTX_get_ex_data(const WOLFSSL_CTX* ctx, int idx);
WOLFSSL_API int wolfSSL_CTX_set_ex_data(WOLFSSL_CTX* ctx, int idx, void* data); WOLFSSL_API int wolfSSL_CTX_set_ex_data(WOLFSSL_CTX* ctx, int idx, void* data);
#ifdef HAVE_EX_DATA_CLEANUP_HOOKS #ifdef HAVE_EX_DATA_CLEANUP_HOOKS
@ -1528,6 +1529,7 @@ WOLFSSL_API int wolfSSL_CTX_set_ex_data_with_cleanup(
void* data, void* data,
wolfSSL_ex_data_cleanup_routine_t cleanup_routine); wolfSSL_ex_data_cleanup_routine_t cleanup_routine);
#endif #endif
#endif /* OPENSSL_EXTRA */
/* ----- EX DATA END ----- */ /* ----- EX DATA END ----- */
WOLFSSL_ABI WOLFSSL_API void wolfSSL_CTX_set_verify(WOLFSSL_CTX* ctx, int mode, WOLFSSL_ABI WOLFSSL_API void wolfSSL_CTX_set_verify(WOLFSSL_CTX* ctx, int mode,