From de75886d0c7fe5cbc89283c74760bd7f6a4665b2 Mon Sep 17 00:00:00 2001 From: Owen Waldron Date: Wed, 18 Nov 2026 12:12:07 -0500 Subject: [PATCH] Halt libjade tests until new upstream is resolved formosa-crypto/libjade moved to formosa-crypto/formosa-libjade and its history was removed, so the pinned `release/2023.05-2` commit can no longer be fetched. Make `copy_from_upstream.py libjade` exit with an explanation, record the situation in `copy_from_libjade.yml`, disable the `libjadecheck` job, and point the CONFIGURE.md link at the new repository. The imported code is unchanged. Assisted-by: Claude:claude-opus-5.5 Signed-off-by: Owen Waldron --- .github/workflows/extended.yml | 4 ++++ CONFIGURE.md | 2 +- scripts/copy_from_upstream/copy_from_libjade.yml | 8 ++++++++ scripts/copy_from_upstream/copy_from_upstream.py | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index 8d4b0201f8..9eaf2a5b7d 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -266,6 +266,10 @@ jobs: libjadecheck: name: Check libjade code is properly integrated + # TODO: Enable this job once the libjade upstream issue is resolved. + # See copy_from_libjade.yml for details. + # Tracked by: https://github.com/open-quantum-safe/liboqs/issues/2697 + if: false runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/CONFIGURE.md b/CONFIGURE.md index 24304aa8fd..741f0f7571 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -287,7 +287,7 @@ Upstream projects can provide memory-optimized implementations by adding a separ **Default**: `OFF`. ## OQS_LIBJADE_BUILD -Can be `ON` or `OFF`. When `ON` liboqs is built to use high assurance implementations of cryptographic algorithms from [Libjade](https://github.com/formosa-crypto/libjade). The cryptographic primitives in Libjade are written using [Jasmin](https://github.com/jasmin-lang/jasmin) and built using the Jasmin compiler. The Jasmin compiler is proven (in Coq) to preserve semantic correctness of a program, maintain secret-independence of control flow, and maintain secret independence of locations of memory access through compilation. Additionally, the Jasmin compiler guarantees thread safety because Jasmin doesn't support global variables. +Can be `ON` or `OFF`. When `ON` liboqs is built to use high assurance implementations of cryptographic algorithms from [Libjade](https://github.com/formosa-crypto/formosa-libjade). The cryptographic primitives in Libjade are written using [Jasmin](https://github.com/jasmin-lang/jasmin) and built using the Jasmin compiler. The Jasmin compiler is proven (in Coq) to preserve semantic correctness of a program, maintain secret-independence of control flow, and maintain secret independence of locations of memory access through compilation. Additionally, the Jasmin compiler guarantees thread safety because Jasmin doesn't support global variables. At the moment, Libjade only provides Kyber512 and Kyber768 KEMs. diff --git a/scripts/copy_from_upstream/copy_from_libjade.yml b/scripts/copy_from_upstream/copy_from_libjade.yml index db2f19c4b8..52dea06760 100644 --- a/scripts/copy_from_upstream/copy_from_libjade.yml +++ b/scripts/copy_from_upstream/copy_from_libjade.yml @@ -3,6 +3,14 @@ # must updated for the relevant algorithm in copy_from_upstream.yml # Additionaly, the algorithm name must be appended to the GitHub repository # environment variable LIBJADE_ALG_LIST. +# +# TODO: libjade upstream was moved from formosa-crypto/libjade to formosa-crypto/formosa-libjade. +# In this move, the branch and commit history of the original libjade repository were removed. +# This file records the old commit, but it is no longer fetchable, and now commit in the new +# repository's history matches the kyber state. +# To fix this, we need to port the import to formosa-libjade's ML-KEM layout, updating +# this file and the relevant sections of the code that depend on it. +# Tracked by: https://github.com/open-quantum-safe/liboqs/issues/2697 jasmin_version: '2023.06.3' upstreams: - diff --git a/scripts/copy_from_upstream/copy_from_upstream.py b/scripts/copy_from_upstream/copy_from_upstream.py index 420d06396a..e2a0c3b840 100755 --- a/scripts/copy_from_upstream/copy_from_upstream.py +++ b/scripts/copy_from_upstream/copy_from_upstream.py @@ -1053,6 +1053,11 @@ def verify_from_upstream(): os.chdir(os.path.join(os.environ['LIBOQS_DIR'],"scripts","copy_from_upstream")) copy_from_upstream(slh_dsa_instruction) elif args.operation == "libjade": + # TODO(#2697): remove once the import is ported to formosa-libjade. + sys.exit("The libjade upstream (formosa-crypto/libjade) moved to " + "formosa-crypto/formosa-libjade and its history was removed, so " + "this import cannot run. See " + "https://github.com/open-quantum-safe/liboqs/issues/2697.") copy_from_libjade() elif args.operation == "verify": verify_from_upstream()