From bfca39a97b5d93ca98a1d6cb87be4ad7f3a05ac1 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 15 Apr 2026 11:53:32 -0500 Subject: [PATCH] src/ssl.c, src/ssl_sess.c, src/x509.c, wolfssl/internal.h: rename wolfssl_get_ex_new_index() to wolfssl_local_get_ex_new_index(). --- src/ssl.c | 14 +++++++------- src/ssl_sess.c | 4 ++-- src/x509.c | 2 +- wolfssl/internal.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 58cd6701c0..0d722f4ae0 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -15086,7 +15086,7 @@ void crypto_ex_cb_free_data(void *obj, CRYPTO_EX_cb_ctx* cb_ctx, } /** - * get_ex_new_index is a helper function for the following + * wolfssl_local_get_ex_new_index is a helper function for the following * xx_get_ex_new_index functions: * - wolfSSL_CRYPTO_get_ex_new_index * - wolfSSL_CTX_get_ex_new_index @@ -15095,7 +15095,7 @@ void crypto_ex_cb_free_data(void *obj, CRYPTO_EX_cb_ctx* cb_ctx, * Returns an index number greater or equal to zero on success, * -1 on failure. */ -int wolfssl_get_ex_new_index(int class_index, long ctx_l, void* ctx_ptr, +int wolfssl_local_get_ex_new_index(int class_index, long ctx_l, void* ctx_ptr, WOLFSSL_CRYPTO_EX_new* new_func, WOLFSSL_CRYPTO_EX_dup* dup_func, WOLFSSL_CRYPTO_EX_free* free_func) { @@ -15161,8 +15161,8 @@ int wolfSSL_CTX_get_ex_new_index(long idx, void* arg, WOLFSSL_ENTER("wolfSSL_CTX_get_ex_new_index"); - return wolfssl_get_ex_new_index(WOLF_CRYPTO_EX_INDEX_SSL_CTX, idx, arg, - new_func, dup_func, free_func); + return wolfssl_local_get_ex_new_index(WOLF_CRYPTO_EX_INDEX_SSL_CTX, idx, + arg, new_func, dup_func, free_func); } /* Return the index that can be used for the WOLFSSL structure to store @@ -15175,8 +15175,8 @@ int wolfSSL_get_ex_new_index(long argValue, void* arg, { WOLFSSL_ENTER("wolfSSL_get_ex_new_index"); - return wolfssl_get_ex_new_index(WOLF_CRYPTO_EX_INDEX_SSL, argValue, arg, - cb1, cb2, cb3); + return wolfssl_local_get_ex_new_index(WOLF_CRYPTO_EX_INDEX_SSL, argValue, + arg, cb1, cb2, cb3); } #endif /* HAVE_EX_DATA_CRYPTO */ @@ -19170,7 +19170,7 @@ int wolfSSL_CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, { WOLFSSL_ENTER("wolfSSL_CRYPTO_get_ex_new_index"); - return wolfssl_get_ex_new_index(class_index, argl, argp, new_func, + return wolfssl_local_get_ex_new_index(class_index, argl, argp, new_func, dup_func, free_func); } #endif /* HAVE_EX_DATA_CRYPTO */ diff --git a/src/ssl_sess.c b/src/ssl_sess.c index d28d28976c..979ce11587 100644 --- a/src/ssl_sess.c +++ b/src/ssl_sess.c @@ -4366,8 +4366,8 @@ int wolfSSL_SESSION_get_ex_new_index(long ctx_l,void* ctx_ptr, WOLFSSL_CRYPTO_EX_free* free_func) { WOLFSSL_ENTER("wolfSSL_SESSION_get_ex_new_index"); - return wolfssl_get_ex_new_index(WOLF_CRYPTO_EX_INDEX_SSL_SESSION, ctx_l, - ctx_ptr, new_func, dup_func, free_func); + return wolfssl_local_get_ex_new_index(WOLF_CRYPTO_EX_INDEX_SSL_SESSION, + ctx_l, ctx_ptr, new_func, dup_func, free_func); } #endif /* HAVE_EX_DATA_CRYPTO */ #endif /* HAVE_EX_DATA */ diff --git a/src/x509.c b/src/x509.c index 9c65158d59..7ea81e2af4 100644 --- a/src/x509.c +++ b/src/x509.c @@ -15463,7 +15463,7 @@ int wolfSSL_X509_get_ex_new_index(int idx, void *arg, { WOLFSSL_ENTER("wolfSSL_X509_get_ex_new_index"); - return wolfssl_get_ex_new_index(WOLF_CRYPTO_EX_INDEX_X509, idx, arg, + return wolfssl_local_get_ex_new_index(WOLF_CRYPTO_EX_INDEX_X509, idx, arg, new_func, dup_func, free_func); } #endif diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 822c0722f6..576492d05d 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -7336,7 +7336,7 @@ WOLFSSL_LOCAL void crypto_ex_cb_free_data(void *obj, CRYPTO_EX_cb_ctx* cb_ctx, WOLFSSL_CRYPTO_EX_DATA* ex_data); WOLFSSL_LOCAL int crypto_ex_cb_dup_data(const WOLFSSL_CRYPTO_EX_DATA *in, WOLFSSL_CRYPTO_EX_DATA *out, CRYPTO_EX_cb_ctx* cb_ctx); -WOLFSSL_LOCAL int wolfssl_get_ex_new_index(int class_index, long ctx_l, +WOLFSSL_LOCAL int wolfssl_local_get_ex_new_index(int class_index, long ctx_l, void* ctx_ptr, WOLFSSL_CRYPTO_EX_new* new_func, WOLFSSL_CRYPTO_EX_dup* dup_func, WOLFSSL_CRYPTO_EX_free* free_func); #endif /* HAVE_EX_DATA_CRYPTO */