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

zephyr no malloc #7438

Merged
merged 8 commits into from
May 9, 2024
Merged

zephyr no malloc #7438

merged 8 commits into from
May 9, 2024

Conversation

julek-wolfssl
Copy link
Member

  • cert gen
  • csr gen
  • pkcs12
  • Compiles for Zephyr 3.4.0 and 2.7.4
  • Add support for CONFIG_POSIX_API

@julek-wolfssl julek-wolfssl self-assigned this Apr 17, 2024
@julek-wolfssl julek-wolfssl force-pushed the zephr-no-malloc branch 2 times, most recently from 5e836f9 to b117d03 Compare April 26, 2024 14:47
billphipps
billphipps previously approved these changes Apr 26, 2024
Copy link
Contributor

@billphipps billphipps left a comment

Choose a reason for hiding this comment

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

Looks good! Seems like the default memory sizes increased and consider splitting this PR between PKCS12 fixes and Zephyr updates.

wolfcrypt/src/memory.c Outdated Show resolved Hide resolved
wolfcrypt/src/memory.c Outdated Show resolved Hide resolved
@@ -3668,11 +3668,13 @@ char* mystrnstr(const char* s1, const char* s2, unsigned int n)

#elif defined(WOLFSSL_ZEPHYR)

void* wolfsslThreadHeapHint = NULL;
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider using the mechanic being introduced in #7478. This would allow your code to continue to pass NULL's in here.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll wait for that PR to merge and use it instead. Good idea.

#undef HAVE_FFDHE_2048
#define HAVE_FFDHE_2048

#define WOLFSSL_NO_MALLOC
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe add #undef WOLFSSL_NO_MALLOC?
Consider adding small stack as well to increase the pressure on the static memory?

Copy link
Member Author

Choose a reason for hiding this comment

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

Adding the undef. I'll leave it as is for now as this is configuration being used by users.

@douzzer douzzer merged commit f7e1e37 into wolfSSL:master May 9, 2024
115 checks passed
jefferyq2 pushed a commit to jefferyq2/wolfssl that referenced this pull request Jun 9, 2024
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.

4 participants