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

Support several pqclean upstream versions #1595

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Conversation

baentsch
Copy link
Member

Fixes #1584.

This PR should be completed/rebased once #1589 landed.

This adds the ability to reference different pqclean versions (commits); kyber-aarch64 and dilithium-aarch64 are pinned to a new upstream name "oldpqclean". True upgrades following more current versions/commits of PQClean should be added only to the "pqclean" upstream. The logic has been tested with #1585 and seems to work OK. The proposal is to land this PR, then rebase #1585 to it.

This PR also removes the unsupported "NOT_READY" feature from copy_from_upstream.

When this lands, an update to the documentation in the wiki is warranted/will be done.

  • [no] Does this PR change the input/output behaviour of a cryptographic algorithm (i.e., does it change known answer test values)? (If so, a version bump will be required from x.y.z to x.(y+1).0.)
  • [no] Does this PR change the list of algorithms available -- either adding, removing, or renaming? Does this PR otherwise change an API? (If so, PRs in fully supported downstream projects dependent on these, i.e., oqs-provider and OQS-OpenSSH will also need to be ready for review and merge by the time this is merged.)

@baentsch baentsch marked this pull request as ready for review October 28, 2023 16:42
@baentsch baentsch requested a review from dstebila as a code owner October 28, 2023 16:42
@baentsch
Copy link
Member Author

FWIW, latest commit is a rebase-and-squash (in case you'd like to check again @dstebila )

Copy link
Member

@SWilson4 SWilson4 left a comment

Choose a reason for hiding this comment

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

Looks good to me! I'm glad that it wasn't necessary to rewrite the entire copy_from_upstream script. Thanks @baentsch.

@baentsch
Copy link
Member Author

I'm glad that it wasn't necessary to rewrite the entire copy_from_upstream script.

I'm not sure about that. This script is pretty hard to understand and maintain and a re-write might be (more) beneficial in the long run.

@baentsch baentsch merged commit 02da567 into main Oct 30, 2023
39 checks passed
@baentsch baentsch deleted the mb-oldpqclean-added branch October 30, 2023 15:43
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.

Improve granularity of copy_from_upstream
3 participants