Skip to content

chore: Mark Kyber as unsupported on all LibCrypto variants#5701

Merged
alexw91 merged 2 commits intoaws:mainfrom
alexw91:deprecate-kyber
Jan 14, 2026
Merged

chore: Mark Kyber as unsupported on all LibCrypto variants#5701
alexw91 merged 2 commits intoaws:mainfrom
alexw91:deprecate-kyber

Conversation

@alexw91
Copy link
Copy Markdown
Contributor

@alexw91 alexw91 commented Jan 13, 2026

Goal

Remove all usages of Kyber NID's and all LibCrypto dependencies on Kyber

Why

Allow AWS-LC to delete all of their Kyber code.

How

Replace all Kyber LibCrypto NIDS with NID_undef. This will cause Kyber to be detected as unsupported on all LibCrypto variants because s2n_kem_is_available() will now always return false.

Other Changes

  • Make as minimal as possible fixes for any broken unit tests.
  • Any tests that assume Kyber is supported if AWS-LC is used are updated to remove just the Kyber tests.
  • If removing only the Kyber tests leaves no remaining PQ tests, then the whole test file is deleted.

Callouts

Lots of existing Kyber code in s2n remains, but it is dead code due to s2n_kem_is_available() never returning true for any Kyber-based KEMs on any LibCrypto's.

Testing

Unit tests on M4 Mac

Related

Resolves #5699

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@alexw91 alexw91 requested a review from dougch as a code owner January 13, 2026 22:17
Copy link
Copy Markdown
Contributor

@dougch dougch left a comment

Choose a reason for hiding this comment

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

No nix integ impact.

@alexw91 alexw91 added this pull request to the merge queue Jan 14, 2026
Merged via the queue into aws:main with commit 7e344d2 Jan 14, 2026
54 checks passed
@alexw91 alexw91 deleted the deprecate-kyber branch January 14, 2026 20:21
@dougch dougch changed the title Mark Kyber as unsupported on all LibCrypto variants chore: Mark Kyber as unsupported on all LibCrypto variants Jan 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove dependencies on Kyber

3 participants