Repository navigation
fix(qruov): migrate importer to official integration upstream - #2685
0rlych1kk4 wants to merge 3 commits into
Conversation
Signed-off-by: 0rlych1kk4 <orlychikka@gmail.com>
|
Thanks for working with the QR-UOV team to sort out this workflow! |
|
I have a question @0rlych1kk4 : there seems to be two repos in the QR-UOV workflow, |
Thanks for raising this, @RodriM11 . My understanding from the discussion with the QR-UOV team is that I would defer to the QR-UOV maintainers to confirm the long-term synchronization policy between these repositories. |
| @@ -0,0 +1,1316 @@ | |||
| diff --git a/integration/liboqs/META_Common.yml b/integration/liboqs/META_Common.yml | |||
There was a problem hiding this comment.
Why is this patch added? What's the reason this doesn't move upstream too? Otherwise it's becoming a maintenance burden here...
There was a problem hiding this comment.
Thanks for raising this. I agree that maintaining a large compatibility patch within liboqs is not ideal.
The patch was introduced to preserve the existing liboqs-imported QR-UOV implementation while switching the importer from my previous fork to the official qruov/round3-liboqs repository. It bridges the differences between the official integration revision and the common-AES and signature-wrapper changes already present in liboqs, without changing the currently imported implementation.
However, I agree with your maintenance concern. Given that round3-liboqs is intended to host liboqs integration changes, I think the better long-term approach is to move the applicable changes upstream and keep only any genuinely liboqs-specific adaptation in the importer.
I'll review how the patch can be reduced and coordinate any necessary upstream changes with the QR-UOV team before updating this PR.
Thank you for pointing this out.
There was a problem hiding this comment.
Thank you again for highlighting the downstream maintenance concern. I've prepared the applicable common-AES backend and signature-wrapper changes upstream in QR-UOV PR #5:
qruov/round3-liboqs#5
Using this upstream-aligned source, I was able to regenerate liboqs locally without the large compatibility patch. The regenerated implementation also passed ARM64 build, signature verification, and reference KAT checks for the tested AES and SHAKE variants.
The upstream PR is currently a draft while the remaining validation and QR-UOV team review are pending.
Once the changes are accepted upstream and the regenerated import is verified, I'll update this liboqs PR to reference the official revision and remove the compatibility patch if it is no longer needed.
But, when looking at that repo, it does not hold only the integration files, it holds all the round 3 files plus the |
Hi @RodriM11, Thank you for raising this question. Thank you. |
So I understand then that yes, every time an update happens, they will do it at both repos, correct? |
Hi @RodriM11, Not necessarily. Based on the clarification I received from Shingo Orihara on November 5, the two repositories have different maintenance policies. My understanding is therefore that updates are not automatically applied to both repositories. Changes specific to liboqs integration can be maintained in I hope this clarifies the distinction. The QR-UOV team can confirm the detailed synchronization policy if needed. |
Signed-off-by: 0rlych1kk4 <orlychikka@gmail.com>
Signed-off-by: 0rlych1kk4 <orlychikka@gmail.com>
f04190c to
fda6a77
Compare
|
Hi @baentsch If you have availability, may I kindly request your technical review of this PR, particularly the QR-UOV official-upstream integration and compatibility changes? The upstream merge conflicts have been resolved, and all CI checks are now complete and passing, including DCO, upstream importer verification, and documentation checks. |
Summary
Fixes #2637.
This PR migrates the QR-UOV
copy_from_upstreamconfiguration from my previous integration fork to the official QR-UOV liboqs integration repository maintained under theqruovorganization.Official upstream:
mainfb4a574c8340a95e88923404143d9364a15b7501The migration introduces
qruov-common-aes-wrapper-compat.patchto preserve the existing liboqs common-AES integration and signature-wrapper behavior while sourcing QR-UOV from the official repository.The existing NetBSD
explicit_memsetcompatibility patch is retained. Generated algorithm documentation and upstream references are updated accordingly.Changes
Validation
Clean PR branch (based on upstream
7bf154f1):copy_from_upstream.py -k verify: 338/338 checked schemes match, zero differences.Original migration validation checkout (macOS ARM64, Apple Clang 21.0.0):
0.The cryptographic tests were performed on the original migration checkout; importer verification was repeated on the clean PR branch.
Cryptographic behavior and API compatibility
Explanation: Neither change is intended. This PR updates the QR-UOV upstream source location while preserving the existing imported implementation and algorithm interfaces. The tested AES and SHAKE KAT values remain unchanged.
Testing and CI
No new feature or algorithm is introduced. Existing importer verification, signature tests, and KAT validation provide regression coverage. No new CI workflow is proposed.
The PR has not yet completed its own GitHub CI checks.
Generative AI disclosure
Generative AI assistance was used for drafting documentation and the PR description. I personally executed the tests, reviewed the changes, and verified the reported results before submission.
Scope
This PR is limited to migrating QR-UOV to the official integration upstream while preserving existing functionality. It does not incorporate the separate stack-workspace changes discussed in #2598.
The compatibility patch is intended to bridge the differences between the current official integration repository and the implementation already imported by liboqs.