Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

with FREERTOS and OPENSSL_ALL add XREMALLOC define #7701

Merged
merged 1 commit into from
Jul 10, 2024

Conversation

JacobBarthelmeh
Copy link
Contributor

ZD 18237

@JacobBarthelmeh JacobBarthelmeh self-assigned this Jul 1, 2024
@@ -1087,7 +1087,8 @@ extern void uITRON4_free(void *p) ;
* heap_caps_realloc(p, s, MALLOC_CAP_8BIT)
* There's no pvPortRealloc available: */
#define XREALLOC(p, n, h, t) ((void)(h), (void)(t), realloc((p), (n)))
#elif defined(USE_INTEGER_HEAP_MATH) || defined(OPENSSL_EXTRA)
#elif defined(USE_INTEGER_HEAP_MATH) || defined(OPENSSL_EXTRA) || \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this because the OPENSSL_ALL doesn't force on OPENSSL_EXTRA until later in settings.h? I recall we had added some logic to force OPENSSL_EXTRA to get set with OPENSSL_ALL.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, OPENSSL_EXTRA gets defined around line 2973 if OPENSSL_ALL is defined

@dgarske
Copy link
Contributor

dgarske commented Jul 1, 2024

Retest this please

@dgarske dgarske merged commit 9bd0985 into wolfSSL:master Jul 10, 2024
119 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants