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

wifi: hostap: Pull external crypto support #2253

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

krish2718
Copy link
Contributor

Pulls in external crypto support that will be used in NCS to manage hostap dependencies and help use revert the noup patches (they will be removed during history rewrite in upcoming upmerge).

modules/hostap/Kconfig Outdated Show resolved Hide resolved
This reverts commit 86bff0f.

Signed-off-by: Chaitanya Tata <[email protected]>
This reverts commit 34010be.

Signed-off-by: Chaitanya Tata <[email protected]>
…security"

This reverts commit d49b489.

Signed-off-by: Chaitanya Tata <[email protected]>
This reverts commit b8406eb.

Signed-off-by: Chaitanya Tata <[email protected]>
Add an option for platforms or forks to provide their own hostap
compatible crypto implementation. This may include proprietary or
platform specific stuff that may or may not be upstreamed to Zephyr.

Upstream PR #: 81243

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718
Copy link
Contributor Author

@carlescufi @rlubos the OSS history on the manifest PR is failing due to a bug in the history, I don't see how it can be fixed without a rewrite, WDYT?

@rlubos
Copy link
Contributor

rlubos commented Nov 18, 2024

Do I understand correctly that the problem here is that we have two commits with the same title [nrf noup] modules: hostap: Add NCS PSA for hostap crypto ALT? I see that one of the commits (33919fc) is still listed in ncs loot even after reverting both, which causes oss-history to fail when trying to reapply it (empty commit...).

Would like to hear from @carlescufi first, but I don't really see a way around this other than history rewrite... For sure we cannot merge like this as it'll break the check for every other PR.

@krish2718
Copy link
Contributor Author

Do I understand correctly that the problem here is that we have two commits with the same title [nrf noup] modules: hostap: Add NCS PSA for hostap crypto ALT? I see that one of the commits (33919fc) is still listed in ncs loot even after reverting both, which causes oss-history to fail when trying to reapply it (empty commit...).

Yes that is the issue.

Would like to hear from @carlescufi first, but I don't really see a way around this other than history rewrite... For sure we cannot merge like this as it'll break the check for every other PR.

Sure, let's resolve this now.

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.

6 participants