pq_crypto 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7887d01882b53d518ecac6559fe2444572c50d5cd7074ee6770d8ea7bcfa32b
-  data.tar.gz: 9b518ef75cacc9d192b40c831e79e31c6883fddd2ce4cf56d2e08f5054da48a3
+  metadata.gz: 68e8c2cd661300cb364be85b4939787590eb88217a2f3cb3463e262b66c4c662
+  data.tar.gz: fef5359500d367c68b50b2a72b54cfc8980b3c6dfd6b0e132998212e34cbd47a
 SHA512:
-  metadata.gz: 90f571ac5fd32557f539303cfc9d7f148aac81532325cd31baf69d879528f91107184ae2c8b785737808bce762f635436506ef265e623dc14f9d51cc61e826b8
-  data.tar.gz: 1783ad30164c271257ee6813ba83c24bc50c99cec0ef274217d4a5d65cffef73447f0b4e66c77952ca3260f2abdfad5740d208729517b34d2a60a84304793e71
+  metadata.gz: 12bfac65233efde5fa34a30df51494bc6da59985287ae2b3954b377dc9afa949f16b509e98db25d7af2a61a7f3b6a4e572b21f33ff85e797a153ee0e0dde10a0
+  data.tar.gz: 25ccfe8a57150355da41a115c401d7ccee2b10a0a6a42957f8335cd3c97024d14261188ee676bc6a122557f52a4ea5894d67062dace53f983b51b4244d9d1a6a

data/CHANGELOG.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## [0.6.5] - 2026-08-04
+
+### Changed
+
+- update native mlkem `v1.2.0` -> `v1.3.0`
+
+  Upstream is a feature/integration release with no security fixes and no
+  changes to the ML-KEM algorithm implementation. Everything relevant to this
+  gem is unchanged: the exported symbol set, all key/ciphertext/shared-secret
+  sizes, and the derived key material for ML-KEM-512/768/1024 (verified
+  byte-for-byte against `v1.2.0` for both the portable and the AVX2 build,
+  including the implicit-rejection path and the SHAKE256/SHA3-256 helpers used
+  by the X-Wing combiner).
+
+  What upstream changed that is visible in the vendored tree:
+  - new opt-in `MLK_CONFIG_NO_{KEYPAIR,ENCAPS,DECAPS}_API` build options; the
+    gem needs all three operations and does not set them
+  - the AArch64 arithmetic and FIPS-202 backends are now gated on compile-time
+    NEON availability (`MLK_SYS_AARCH64_NEON`) and on the new `MLK_SYS_CAP_NEON`
+    runtime capability, which defaults to "available"
+  - new opt-in `MLK_SYS_AARCH64_FAST_SHA3` for CPUs with high SHA3 throughput
+  - backend assembly files renamed with an `mlkem_` prefix and assembly-local
+    labels namespaced with `mlk_`; both are internal to the vendored aggregator
+    `mlkem_native_asm.S` and transparent to this build
+  - context-parameter machinery moved into the new `mlkem/src/context.h`
+
+  Note that `mlkem-native` v1.3.0 is the last release before a breaking v2;
+  `release/v1.3` is the upstream support branch.
+
+- `mldsa-native` remains pinned at `v1.0.0-beta2`, which is still the latest
+  upstream tag.
+
+### Testing
+
+- Added `test/native_api_conformance`, a compile-only check that validates the
+  hand-written declarations in `ext/pqcrypto/pqcrypto_native_api.h` against the
+  vendored upstream headers. The extension deliberately never includes
+  `mlkem_native.h` / `mldsa_native.h`, so nothing else in the build could catch
+  size or prototype drift after a vendor bump.
+
+### CI
+
+- Run the native API conformance check right after `vendor:verify`.
+- Verify that the AArch64 assembly backends are actually compiled in on
+  macOS ARM runners, and smoke-test ML-KEM and ML-DSA against that build.
+
 ## [0.6.4] - 2026-07-18
 
 ### Compatibility

data/README.md

@@ -87,6 +87,11 @@ bundle exec rake vendor
 bundle exec rake compile
 ```
 
+Upstream pins are recorded in `ext/pqcrypto/vendor/.vendored` and enforced by
+`bundle exec rake vendor:verify`. `mlkem-native` is pinned at `v1.3.0`, which
+upstream describes as the last release before a breaking `v2`; `release/v1.3` is
+the upstream support branch. `mldsa-native` is pinned at `v1.0.0-beta2`.
+
 The default build uses the portable native source path. Upstream native assembly
 can be tested explicitly with:
 

data/ext/pqcrypto/pqcrypto_version.h

@@ -2,6 +2,6 @@
 #ifndef PQCRYPTO_VERSION_H
 #define PQCRYPTO_VERSION_H
 
-#define PQCRYPTO_VERSION "0.6.4"
+#define PQCRYPTO_VERSION "0.6.5"
 
 #endif

data/ext/pqcrypto/vendor/.vendored

@@ -2,11 +2,11 @@
 backend=PQ Code Package native only
 pqclean=removed
 mlkem_native_repo=https://github.com/pq-code-package/mlkem-native.git
-mlkem_native_ref=v1.2.0
-mlkem_native_commit=0ba906cb14b1c241476134d7403a811b382ca498
-mlkem_native_tree_sha256=cc78ed199b8c65abe68635b23a13b294d5a8deb20c8bc7b4d76590c00976bb2d
+mlkem_native_ref=v1.3.0
+mlkem_native_commit=398050c877ff4353c96305c6434b63528accfc37
+mlkem_native_tree_sha256=3cd7af93cde256f73ce5ffde3ac3accd31e4361616e275f1bf1c39d462c2149e
 mldsa_native_repo=https://github.com/pq-code-package/mldsa-native.git
 mldsa_native_ref=v1.0.0-beta2
 mldsa_native_commit=9b0ee84f4cf399043eca59eca4e5f8531ca1d61b
 mldsa_native_tree_sha256=2887f59926c18a877e8c5a5e30727e84497c357032093d00d7135aedf53f011e
-manifest_sha256=011e9d7d1160c7d612869695d950e17f9e330dac6bf782883639593f96fee951
+manifest_sha256=6fc387662d86d42905f6cbed29c92bc83abf18e8678a21500eb27fce14a89c7d

data/ext/pqcrypto/vendor/mlkem-native/README.md

@@ -2,9 +2,7 @@
 
 # mlkem-native
 
-![Base tests](https://github.com/pq-code-package/mlkem-native/actions/workflows/base.yml/badge.svg)
-![Extended tests](https://github.com/pq-code-package/mlkem-native/actions/workflows/ci.yml/badge.svg)
-![Proof: CBMC](https://github.com/pq-code-package/mlkem-native/actions/workflows/cbmc.yml/badge.svg)
+![CI](https://github.com/pq-code-package/mlkem-native/actions/workflows/all.yml/badge.svg)
 ![Proof: HOL-Light](https://github.com/pq-code-package/mlkem-native/actions/workflows/hol_light.yml/badge.svg)
 ![Benchmarks](https://github.com/pq-code-package/mlkem-native/actions/workflows/bench.yml/badge.svg)
 ![C90](https://img.shields.io/badge/language-C90-blue.svg)
@@ -102,7 +100,7 @@ mlkem-native currently offers the following backends:
 If you'd like contribute new backends, please reach out or just open a PR.
 
 Our AArch64 assembly is developed using the [SLOTHY](https://github.com/slothy-optimizer/slothy) superoptimizer, following the approach described in the SLOTHY paper[^SLOTHY_Paper]:
-We write 'clean' assembly by hand and automate micro-optimizations (e.g. see the [clean](dev/aarch64_clean/src/ntt_aarch64_asm.S) vs [optimized](dev/aarch64_opt/src/ntt_aarch64_asm.S) AArch64 NTT).
+We write 'clean' assembly by hand and automate micro-optimizations (e.g. see the [clean](dev/aarch64_clean/src/mlkem_ntt_aarch64_asm.S) vs [optimized](dev/aarch64_opt/src/mlkem_ntt_aarch64_asm.S) AArch64 NTT).
 See [dev/README.md](dev/README.md) for more details.
 
 ## Test Vectors

data/ext/pqcrypto/vendor/mlkem-native/RELEASE.md

@@ -1,5 +1,103 @@
 [//]: # (SPDX-License-Identifier: CC-BY-4.0)
 
+mlkem-native v1.3.0
+===================
+
+Release notes
+-------------
+
+mlkem-native v1.3.0 adds configuration options to control which KEM operations
+are included in a build. It also improves AArch64 feature detection and runtime
+dispatch, and introduces ABI compliance checks for assembly backends. Embedded
+testing now uses Zephyr across a broader range of Arm targets, while assembly
+namespacing and source naming improve integration with projects such as AWS-LC.
+
+See the full change log here:
+https://github.com/pq-code-package/mlkem-native/compare/v1.2.0...v1.3.0
+
+What's next? mlkem-native v2
+----------------------------
+
+This is expected to be the last release prior to mlkem-native v2. Between
+v1.3.0 and v2, breaking changes to the `main` branch will be made.
+
+Long-Term Support
+-----------------
+
+`release/v1.3` will act as a support branch until 6 months after
+mlkem-native v2 is established. It will receive bugfixes, but no new features.
+We do currently not plan to offer long-term support for mlkem-native v1.x
+beyond that timeframe.
+
+If you are deploying mlkem-native v1.3 and expect to be unable to upgrade to
+mlkem-native v2 within 6 months of its release, please contact us to discuss
+a potential extension of the support schedule.
+
+What's New
+----------
+
+### Configuration / API
+
+- Add `MLK_CONFIG_NO_KEYPAIR_API`, `MLK_CONFIG_NO_ENCAPS_API`, and
+  `MLK_CONFIG_NO_DECAPS_API`, allowing unused KEM operations and their internal
+  dependencies to be excluded. All non-empty API combinations are covered in
+  CI. ([#1787](https://github.com/pq-code-package/mlkem-native/pull/1787))
+- Gate the AArch64 arithmetic and FIPS-202 backends on compile-time NEON
+  availability and the new `MLK_SYS_CAP_NEON` runtime capability. Integrators
+  can now fall back to portable C on AArch64 systems without usable NEON.
+  ([#1805](https://github.com/pq-code-package/mlkem-native/pull/1805),
+  [#1809](https://github.com/pq-code-package/mlkem-native/pull/1809))
+- Add `MLK_SYS_AARCH64_FAST_SHA3` to select the pure-Neon Armv8.4-A SHA3
+  implementation on CPUs with sufficient SHA3 execution capacity, including
+  Graviton5. ([#1784](https://github.com/pq-code-package/mlkem-native/pull/1784))
+
+### Assurance / Testing
+
+- Fix deterministic-only builds using `MLK_CONFIG_NO_RANDOMIZED_API`, including
+  test, example, and stack-measurement coverage.
+  ([#1816](https://github.com/pq-code-package/mlkem-native/pull/1816))
+- Upgrade CBMC to v6.10.0, the newest release of CBMC including the fix
+  [cbmc/#9011](https://github.com/diffblue/cbmc/pull/9011) to the Z3 soundness
+  issue [z3/#9550](https://github.com/Z3Prover/z3/issues/9550). mlkem-native v1.2
+  had pinned CBMC to an unstable version between v6.9 and v6.10 which already
+  included that fix.
+  ([#1762](https://github.com/pq-code-package/mlkem-native/pull/1762))
+- Add assembly ABI checkers for AArch64, x86_64 SysV, ppc64le ELFv2, and
+  Armv8.1-M MVE. The checkers verify preservation of callee-saved registers and
+  run as part of the standard test suite.
+  ([#1135](https://github.com/pq-code-package/mlkem-native/pull/1135))
+- Add Zephyr-based testing for QEMU Cortex-M3, M4, M7, M33, and M55 targets,
+  replacing the previous custom MPS baremetal platforms. Add test and benchmark
+  support for the NUCLEO-N657X0-Q board.
+  ([#1750](https://github.com/pq-code-package/mlkem-native/pull/1750),
+  [#1547](https://github.com/pq-code-package/mlkem-native/pull/1547))
+- Strengthen HOL Light tooling with cross-architecture proof execution and
+  checks that every expected theorem is present
+  ([#1634](https://github.com/pq-code-package/mlkem-native/pull/1634))
+- Strengthen Wycheproof validation by checking newly specified fields, rejecting
+  unknown schema fields, and tracking upstream vector changes.
+  ([#1801](https://github.com/pq-code-package/mlkem-native/pull/1801))
+- Extend Windows MSVC coverage to allocation-failure, RNG-failure, and
+  Wycheproof tests ([#1738](https://github.com/pq-code-package/mlkem-native/pull/1738))
+- Add emulated testing on x86_64 without AVX2.
+  ([#1753](https://github.com/pq-code-package/mlkem-native/pull/1753))
+- Correct decapsulation stack measurements, which previously returned before
+  the full operation and understated peak stack use by around 10%.
+  ([#1823](https://github.com/pq-code-package/mlkem-native/pull/1823))
+
+### Integration / Upgrade Notes
+
+- Namespace assembly-local labels with an `mlk_` prefix, preventing collisions
+  when mlkem-native and other projects are combined into one assembly unit.
+  ([#1813](https://github.com/pq-code-package/mlkem-native/pull/1813))
+- Rename backend assembly files to be self-identifying. Arithmetic assembly
+  filenames now use an `mlkem_` prefix. Downstream build systems with explicit
+  source lists must update those paths.
+  ([#1821](https://github.com/pq-code-package/mlkem-native/pull/1821))
+- Move context-parameter support into the new `mlkem/src/context.h`; downstream
+  source manifests must include this file.
+  ([#1768](https://github.com/pq-code-package/mlkem-native/pull/1768))
+
 mlkem-native v1.2.0
 ===================
 

data/ext/pqcrypto/vendor/mlkem-native/mlkem/mlkem_native.c

@@ -202,11 +202,6 @@
 #undef MLK_COMMON_H
 #undef MLK_CONCAT
 #undef MLK_CONCAT_
-#undef MLK_CONTEXT_PARAMETERS_0
-#undef MLK_CONTEXT_PARAMETERS_1
-#undef MLK_CONTEXT_PARAMETERS_2
-#undef MLK_CONTEXT_PARAMETERS_3
-#undef MLK_CONTEXT_PARAMETERS_4
 #undef MLK_EMPTY_CU
 #undef MLK_ERR_FAIL
 #undef MLK_ERR_OUT_OF_MEMORY
@@ -311,6 +306,13 @@
 #undef mlk_poly_frommsg
 #undef mlk_poly_tobytes
 #undef mlk_poly_tomsg
+/* mlkem/src/context.h */
+#undef MLK_CONTEXT_H
+#undef MLK_CONTEXT_PARAMETERS_0
+#undef MLK_CONTEXT_PARAMETERS_1
+#undef MLK_CONTEXT_PARAMETERS_2
+#undef MLK_CONTEXT_PARAMETERS_3
+#undef MLK_CONTEXT_PARAMETERS_4
 /* mlkem/src/debug.h */
 #undef MLK_DEBUG_H
 #undef mlk_assert
@@ -377,6 +379,7 @@
 #undef MLK_SYSV_ABI_SUPPORTED
 #undef MLK_SYS_AARCH64
 #undef MLK_SYS_AARCH64_EB
+#undef MLK_SYS_AARCH64_NEON
 #undef MLK_SYS_APPLE
 #undef MLK_SYS_ARMV81M_MVE
 #undef MLK_SYS_BIG_ENDIAN
@@ -508,8 +511,6 @@
 #undef MLK_USE_FIPS202_X4_NATIVE
 #undef MLK_USE_FIPS202_X4_XOR_BYTES_NATIVE
 #undef mlk_keccak_f1600_x4_native_impl
-#undef mlk_keccak_f1600_x4_state_extract_bytes
-#undef mlk_keccak_f1600_x4_state_xor_bytes
 /* mlkem/src/fips202/native/armv81m/src/fips202_native_armv81m.h */
 #undef MLK_FIPS202_NATIVE_ARMV81M_SRC_FIPS202_NATIVE_ARMV81M_H
 #undef mlk_keccak_f1600_x4_mve_asm

data/ext/pqcrypto/vendor/mlkem-native/mlkem/mlkem_native.h

@@ -191,6 +191,7 @@ extern "C"
 {
 #endif
 
+#if !defined(MLK_CONFIG_NO_KEYPAIR_API)
 /**
  * Generate a public/private keypair for the ML-KEM key encapsulation mechanism.
  *
@@ -255,7 +256,9 @@ int MLK_API_NAMESPACE(keypair)(
 #endif
 );
 #endif /* !MLK_CONFIG_NO_RANDOMIZED_API */
+#endif /* !MLK_CONFIG_NO_KEYPAIR_API */
 
+#if !defined(MLK_CONFIG_NO_ENCAPS_API)
 /**
  * Generate ciphertext and shared secret for a given public key.
  *
@@ -324,7 +327,9 @@ int MLK_API_NAMESPACE(enc)(
 #endif
 );
 #endif /* !MLK_CONFIG_NO_RANDOMIZED_API */
+#endif /* !MLK_CONFIG_NO_ENCAPS_API */
 
+#if !defined(MLK_CONFIG_NO_DECAPS_API)
 /**
  * Generate shared secret for a given ciphertext and private key.
  *
@@ -356,6 +361,7 @@ int MLK_API_NAMESPACE(dec)(
     MLK_CONFIG_CONTEXT_PARAMETER_TYPE context
 #endif
 );
+#endif /* !MLK_CONFIG_NO_DECAPS_API */
 
 
 /**
@@ -375,6 +381,7 @@ int MLK_API_NAMESPACE(dec)(
  * @retval MLK_ERR_OUT_OF_MEMORY MLK_CONFIG_CUSTOM_ALLOC_FREE was used and
  *                               MLK_CUSTOM_ALLOC returned NULL.
  */
+#if !defined(MLK_CONFIG_NO_ENCAPS_API)
 MLK_API_QUALIFIER
 MLK_API_MUST_CHECK_RETURN_VALUE
 int MLK_API_NAMESPACE(check_pk)(
@@ -384,6 +391,7 @@ int MLK_API_NAMESPACE(check_pk)(
     MLK_CONFIG_CONTEXT_PARAMETER_TYPE context
 #endif
 );
+#endif /* !MLK_CONFIG_NO_ENCAPS_API */
 
 /**
  * Implements public key hash check mandated by FIPS 203, i.e., ensures that
@@ -402,6 +410,7 @@ int MLK_API_NAMESPACE(check_pk)(
  * @retval MLK_ERR_OUT_OF_MEMORY MLK_CONFIG_CUSTOM_ALLOC_FREE was used and
  *                               MLK_CUSTOM_ALLOC returned NULL.
  */
+#if !defined(MLK_CONFIG_NO_DECAPS_API)
 MLK_API_QUALIFIER
 MLK_API_MUST_CHECK_RETURN_VALUE
 int MLK_API_NAMESPACE(check_sk)(
@@ -411,6 +420,7 @@ int MLK_API_NAMESPACE(check_sk)(
     MLK_CONFIG_CONTEXT_PARAMETER_TYPE context
 #endif
 );
+#endif /* !MLK_CONFIG_NO_DECAPS_API */
 
 #ifdef __cplusplus
 }
@@ -427,13 +437,23 @@ int MLK_API_NAMESPACE(check_sk)(
 #define CRYPTO_SYMBYTES MLKEM_SYMBYTES
 #define CRYPTO_BYTES MLKEM_BYTES
 
+#if !defined(MLK_CONFIG_NO_KEYPAIR_API)
 #define crypto_kem_keypair_derand MLK_API_NAMESPACE(keypair_derand)
+#if !defined(MLK_CONFIG_NO_RANDOMIZED_API)
 #define crypto_kem_keypair MLK_API_NAMESPACE(keypair)
+#endif
+#endif /* !MLK_CONFIG_NO_KEYPAIR_API */
+#if !defined(MLK_CONFIG_NO_ENCAPS_API)
 #define crypto_kem_enc_derand MLK_API_NAMESPACE(enc_derand)
+#if !defined(MLK_CONFIG_NO_RANDOMIZED_API)
 #define crypto_kem_enc MLK_API_NAMESPACE(enc)
-#define crypto_kem_dec MLK_API_NAMESPACE(dec)
+#endif
 #define crypto_kem_check_pk MLK_API_NAMESPACE(check_pk)
+#endif /* !MLK_CONFIG_NO_ENCAPS_API */
+#if !defined(MLK_CONFIG_NO_DECAPS_API)
+#define crypto_kem_dec MLK_API_NAMESPACE(dec)
 #define crypto_kem_check_sk MLK_API_NAMESPACE(check_sk)
+#endif
 
 #else /* !MLK_CONFIG_API_NO_SUPERCOP */
 

data/ext/pqcrypto/vendor/mlkem-native/mlkem/mlkem_native_asm.S

@@ -22,7 +22,7 @@
  * levels, you should include this file once with
  * MLK_CONFIG_MULTILEVEL_WITH_SHARED set.
  *
- * (You could also follow the same pattern as for mlkem_native_monobuild.c
+ * (You could also follow the same pattern as for mlkem_native.c
  *  and include it for every level, setting MLK_CONFIG_MULTILEVEL_NO_SHARED
  *  for all but one. For builds with MLK_CONFIG_MULTILEVEL_NO_SHARED, this
  *  file will then be ignored.)
@@ -60,46 +60,46 @@
 
 #if defined(MLK_CONFIG_USE_NATIVE_BACKEND_ARITH)
 #if defined(MLK_SYS_AARCH64)
-#include "src/native/aarch64/src/intt_aarch64_asm.S"
-#include "src/native/aarch64/src/ntt_aarch64_asm.S"
-#include "src/native/aarch64/src/poly_mulcache_compute_aarch64_asm.S"
-#include "src/native/aarch64/src/poly_reduce_aarch64_asm.S"
-#include "src/native/aarch64/src/poly_tobytes_aarch64_asm.S"
-#include "src/native/aarch64/src/poly_tomont_aarch64_asm.S"
-#include "src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S"
-#include "src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S"
-#include "src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S"
-#include "src/native/aarch64/src/rej_uniform_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_intt_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_ntt_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_poly_mulcache_compute_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_poly_reduce_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_poly_tobytes_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_poly_tomont_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S"
+#include "src/native/aarch64/src/mlkem_rej_uniform_aarch64_asm.S"
 #endif /* MLK_SYS_AARCH64 */
 #if defined(MLK_SYS_X86_64)
-#include "src/native/x86_64/src/intt_avx2_asm.S"
-#include "src/native/x86_64/src/ntt_avx2_asm.S"
-#include "src/native/x86_64/src/nttfrombytes_avx2_asm.S"
-#include "src/native/x86_64/src/ntttobytes_avx2_asm.S"
-#include "src/native/x86_64/src/nttunpack_avx2_asm.S"
-#include "src/native/x86_64/src/poly_compress_d10_avx2_asm.S"
-#include "src/native/x86_64/src/poly_compress_d11_avx2_asm.S"
-#include "src/native/x86_64/src/poly_compress_d4_avx2_asm.S"
-#include "src/native/x86_64/src/poly_compress_d5_avx2_asm.S"
-#include "src/native/x86_64/src/poly_decompress_d10_avx2_asm.S"
-#include "src/native/x86_64/src/poly_decompress_d11_avx2_asm.S"
-#include "src/native/x86_64/src/poly_decompress_d4_avx2_asm.S"
-#include "src/native/x86_64/src/poly_decompress_d5_avx2_asm.S"
-#include "src/native/x86_64/src/poly_mulcache_compute_avx2_asm.S"
-#include "src/native/x86_64/src/polyvec_basemul_acc_montgomery_cached_k2_avx2_asm.S"
-#include "src/native/x86_64/src/polyvec_basemul_acc_montgomery_cached_k3_avx2_asm.S"
-#include "src/native/x86_64/src/polyvec_basemul_acc_montgomery_cached_k4_avx2_asm.S"
-#include "src/native/x86_64/src/reduce_avx2_asm.S"
-#include "src/native/x86_64/src/rej_uniform_avx2_asm.S"
-#include "src/native/x86_64/src/tomont_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_intt_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_ntt_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_nttfrombytes_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_ntttobytes_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_nttunpack_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_compress_d10_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_compress_d11_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_compress_d4_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_compress_d5_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_decompress_d10_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_decompress_d11_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_decompress_d4_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_decompress_d5_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_poly_mulcache_compute_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_polyvec_basemul_acc_montgomery_cached_k2_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_polyvec_basemul_acc_montgomery_cached_k3_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_polyvec_basemul_acc_montgomery_cached_k4_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_reduce_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_rej_uniform_avx2_asm.S"
+#include "src/native/x86_64/src/mlkem_tomont_avx2_asm.S"
 #endif /* MLK_SYS_X86_64 */
 #if defined(MLK_SYS_RISCV64)
 #endif
 #if defined(MLK_SYS_PPC64LE)
-#include "src/native/ppc64le/src/intt_ppc_asm.S"
-#include "src/native/ppc64le/src/ntt_ppc_asm.S"
-#include "src/native/ppc64le/src/poly_tomont_ppc_asm.S"
-#include "src/native/ppc64le/src/reduce_ppc_asm.S"
+#include "src/native/ppc64le/src/mlkem_intt_ppc_asm.S"
+#include "src/native/ppc64le/src/mlkem_ntt_ppc_asm.S"
+#include "src/native/ppc64le/src/mlkem_poly_tomont_ppc_asm.S"
+#include "src/native/ppc64le/src/mlkem_reduce_ppc_asm.S"
 #endif /* MLK_SYS_PPC64LE */
 #endif /* MLK_CONFIG_USE_NATIVE_BACKEND_ARITH */
 
@@ -116,8 +116,8 @@
 #endif
 #if defined(MLK_SYS_ARMV81M_MVE)
 #include "src/fips202/native/armv81m/src/keccak_f1600_x4_mve.S"
-#include "src/fips202/native/armv81m/src/state_extract_bytes_x4_mve.S"
-#include "src/fips202/native/armv81m/src/state_xor_bytes_x4_mve.S"
+#include "src/fips202/native/armv81m/src/keccak_f1600_x4_state_extract_bytes_mve.S"
+#include "src/fips202/native/armv81m/src/keccak_f1600_x4_state_xor_bytes_mve.S"
 #endif
 #endif /* MLK_CONFIG_USE_NATIVE_BACKEND_FIPS202 */
 
@@ -226,11 +226,6 @@
 #undef MLK_COMMON_H
 #undef MLK_CONCAT
 #undef MLK_CONCAT_
-#undef MLK_CONTEXT_PARAMETERS_0
-#undef MLK_CONTEXT_PARAMETERS_1
-#undef MLK_CONTEXT_PARAMETERS_2
-#undef MLK_CONTEXT_PARAMETERS_3
-#undef MLK_CONTEXT_PARAMETERS_4
 #undef MLK_EMPTY_CU
 #undef MLK_ERR_FAIL
 #undef MLK_ERR_OUT_OF_MEMORY
@@ -335,6 +330,13 @@
 #undef mlk_poly_frommsg
 #undef mlk_poly_tobytes
 #undef mlk_poly_tomsg
+/* mlkem/src/context.h */
+#undef MLK_CONTEXT_H
+#undef MLK_CONTEXT_PARAMETERS_0
+#undef MLK_CONTEXT_PARAMETERS_1
+#undef MLK_CONTEXT_PARAMETERS_2
+#undef MLK_CONTEXT_PARAMETERS_3
+#undef MLK_CONTEXT_PARAMETERS_4
 /* mlkem/src/debug.h */
 #undef MLK_DEBUG_H
 #undef mlk_assert
@@ -401,6 +403,7 @@
 #undef MLK_SYSV_ABI_SUPPORTED
 #undef MLK_SYS_AARCH64
 #undef MLK_SYS_AARCH64_EB
+#undef MLK_SYS_AARCH64_NEON
 #undef MLK_SYS_APPLE
 #undef MLK_SYS_ARMV81M_MVE
 #undef MLK_SYS_BIG_ENDIAN
@@ -532,8 +535,6 @@
 #undef MLK_USE_FIPS202_X4_NATIVE
 #undef MLK_USE_FIPS202_X4_XOR_BYTES_NATIVE
 #undef mlk_keccak_f1600_x4_native_impl
-#undef mlk_keccak_f1600_x4_state_extract_bytes
-#undef mlk_keccak_f1600_x4_state_xor_bytes
 /* mlkem/src/fips202/native/armv81m/src/fips202_native_armv81m.h */
 #undef MLK_FIPS202_NATIVE_ARMV81M_SRC_FIPS202_NATIVE_ARMV81M_H
 #undef mlk_keccak_f1600_x4_mve_asm

data/ext/pqcrypto/vendor/mlkem-native/mlkem/mlkem_native_config.h

@@ -99,6 +99,42 @@
  */
 /* #define MLK_CONFIG_EXTERNAL_API_QUALIFIER */
 
+/**
+ * MLK_CONFIG_NO_KEYPAIR_API
+ *
+ * By default, mlkem-native includes support for generating key pairs.
+ * If you don't need this, set MLK_CONFIG_NO_KEYPAIR_API to exclude
+ * crypto_kem_keypair and crypto_kem_keypair_derand, and all internal
+ * APIs only needed by those functions.
+ */
+/* #define MLK_CONFIG_NO_KEYPAIR_API */
+
+/**
+ * MLK_CONFIG_NO_ENCAPS_API
+ *
+ * By default, mlkem-native includes support for encapsulation. If you
+ * don't need this, set MLK_CONFIG_NO_ENCAPS_API to exclude
+ * crypto_kem_enc, crypto_kem_enc_derand, crypto_kem_check_pk, and
+ * all internal APIs only needed by those functions.
+ *
+ * @note Setting this option is incompatible with MLK_CONFIG_KEYGEN_PCT
+ *       as the current PCT implementation requires crypto_kem_enc().
+ */
+/* #define MLK_CONFIG_NO_ENCAPS_API */
+
+/**
+ * MLK_CONFIG_NO_DECAPS_API
+ *
+ * By default, mlkem-native includes support for decapsulation. If you
+ * don't need this, set MLK_CONFIG_NO_DECAPS_API to exclude
+ * crypto_kem_dec, crypto_kem_check_sk, and all internal APIs only
+ * needed by those functions.
+ *
+ * @note Setting this option is incompatible with MLK_CONFIG_KEYGEN_PCT
+ *       as the current PCT implementation requires crypto_kem_dec().
+ */
+/* #define MLK_CONFIG_NO_DECAPS_API */
+
 /**
  * MLK_CONFIG_NO_RANDOMIZED_API
  *

data/ext/pqcrypto/vendor/mlkem-native/mlkem/src/common.h

@@ -125,6 +125,14 @@
 #error Bad configuration: MLK_CONFIG_NO_RANDOMIZED_API is incompatible with MLK_CONFIG_KEYGEN_PCT as the current PCT implementation requires crypto_kem_enc()
 #endif
 
+#if defined(MLK_CONFIG_NO_ENCAPS_API) && defined(MLK_CONFIG_KEYGEN_PCT)
+#error Bad configuration: MLK_CONFIG_NO_ENCAPS_API is incompatible with MLK_CONFIG_KEYGEN_PCT as the current PCT implementation requires crypto_kem_enc()
+#endif
+
+#if defined(MLK_CONFIG_NO_DECAPS_API) && defined(MLK_CONFIG_KEYGEN_PCT)
+#error Bad configuration: MLK_CONFIG_NO_DECAPS_API is incompatible with MLK_CONFIG_KEYGEN_PCT as the current PCT implementation requires crypto_kem_dec()
+#endif
+
 #if defined(MLK_CONFIG_USE_NATIVE_BACKEND_ARITH)
 #include MLK_CONFIG_ARITH_BACKEND_FILE
 /* Include to enforce consistency of API and implementation,
@@ -188,36 +196,11 @@
 #error Bad configuration: MLK_CONFIG_CUSTOM_ALLOC_FREE must be set together with MLK_CUSTOM_ALLOC and MLK_CUSTOM_FREE
 #endif
 
-/*
- * If the integration wants to provide a context parameter for use in
- * platform-specific hooks, then it should define this parameter.
- *
- * The MLK_CONTEXT_PARAMETERS_n macros are intended to be used with macros
- * defining the function names and expand to either pass or discard the context
- * argument as required by the current build.  If there is no context parameter
- * requested then these are removed from the prototypes and from all calls.
- */
-#ifdef MLK_CONFIG_CONTEXT_PARAMETER
-#define MLK_CONTEXT_PARAMETERS_0(context) (context)
-#define MLK_CONTEXT_PARAMETERS_1(arg0, context) (arg0, context)
-#define MLK_CONTEXT_PARAMETERS_2(arg0, arg1, context) (arg0, arg1, context)
-#define MLK_CONTEXT_PARAMETERS_3(arg0, arg1, arg2, context) \
-  (arg0, arg1, arg2, context)
-#define MLK_CONTEXT_PARAMETERS_4(arg0, arg1, arg2, arg3, context) \
-  (arg0, arg1, arg2, arg3, context)
-#else /* MLK_CONFIG_CONTEXT_PARAMETER */
-#define MLK_CONTEXT_PARAMETERS_0(context) ()
-#define MLK_CONTEXT_PARAMETERS_1(arg0, context) (arg0)
-#define MLK_CONTEXT_PARAMETERS_2(arg0, arg1, context) (arg0, arg1)
-#define MLK_CONTEXT_PARAMETERS_3(arg0, arg1, arg2, context) (arg0, arg1, arg2)
-#define MLK_CONTEXT_PARAMETERS_4(arg0, arg1, arg2, arg3, context) \
-  (arg0, arg1, arg2, arg3)
-#endif /* !MLK_CONFIG_CONTEXT_PARAMETER */
-
-#if defined(MLK_CONFIG_CONTEXT_PARAMETER_TYPE) != \
-    defined(MLK_CONFIG_CONTEXT_PARAMETER)
-#error MLK_CONFIG_CONTEXT_PARAMETER_TYPE must be defined if and only if MLK_CONFIG_CONTEXT_PARAMETER is defined
-#endif
+/* Context-parameter machinery (MLK_CONTEXT_PARAMETERS_n and related config
+ * checks). Kept in a separate, level-generic header for readability; included
+ * here so it is available to the allocation macros below and to all consumers
+ * of common.h. */
+#include "context.h"
 
 #if !defined(MLK_CONFIG_CUSTOM_ALLOC_FREE)
 /* Default: stack allocation */