Skip to content

Drop redundant mlkem.h include#960

Merged
padelsbach merged 1 commit intowolfSSL:masterfrom
ejohnstown:mlkem
Apr 30, 2026
Merged

Drop redundant mlkem.h include#960
padelsbach merged 1 commit intowolfSSL:masterfrom
ejohnstown:mlkem

Conversation

@ejohnstown
Copy link
Copy Markdown
Contributor

@ejohnstown ejohnstown commented Apr 30, 2026

Drop redundant mlkem.h include. wc_mlkem.h used to include it already. mlkem.h was merged with wc_mlkem.h as of today.

Copilot AI review requested due to automatic review settings April 30, 2026 18:57
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the Autoconf detection flow and compilation guards to safely include ML-KEM headers only when they are available, aligning configure.ac checks with the resolved wolfSSL include path and preventing build failures when wolfssl/wolfcrypt/mlkem.h is missing.

Changes:

  • Moves AC_CHECK_HEADERS / AC_CHECK_LIB to run after the wolfSSL --with-wolfssl path handling so the computed CPPFLAGS/LDFLAGS are applied.
  • Adds wolfssl/wolfcrypt/mlkem.h to the Autoconf header probes (generating HAVE_WOLFSSL_WOLFCRYPT_MLKEM_H).
  • Guards the mlkem.h include in src/internal.c behind HAVE_WOLFSSL_WOLFCRYPT_MLKEM_H.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
src/internal.c Adds an Autoconf-driven compile guard around the optional mlkem.h include.
configure.ac Reorders and expands header/library checks so wolfSSL path flags are applied and mlkem.h is probed.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/internal.c Outdated
Copy link
Copy Markdown
Contributor

@padelsbach padelsbach left a comment

Choose a reason for hiding this comment

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

Guessing the goal of this PR is to support an older wolfssl without mlkem -- is that right? Is there a specific version that I can try?

Comment thread src/internal.c
Comment thread src/internal.c Outdated
@ejohnstown ejohnstown requested a review from padelsbach April 30, 2026 21:07
@ejohnstown ejohnstown changed the title Gate mlkem.h include behind autoconf check Drop redundant mlkem.h include Apr 30, 2026
@padelsbach padelsbach merged commit 73b10ad into wolfSSL:master Apr 30, 2026
130 checks passed
@ejohnstown ejohnstown deleted the mlkem branch April 30, 2026 21:24
@ejohnstown ejohnstown restored the mlkem branch May 1, 2026 03:52
@ejohnstown ejohnstown deleted the mlkem branch May 1, 2026 03:54
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