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

Copy from upstream (Kyber), add pqcrystals-* licenses to README #1403

Merged
merged 2 commits into from
Feb 25, 2023

Conversation

bhess
Copy link
Member

@bhess bhess commented Feb 23, 2023

  • Pulls latest Kyber commit from upstream (pqcrystals)
  • Updates readme with pqcrystals license information (CC0 or Apache-2.0)

Fixes #1402

  • 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.)
  • Does this PR change the the list of algorithms available -- either adding, removing, or renaming? Does this PR otherwise change an API? (If so, PRs in oqs-provider, OQS-OpenSSL, OQS-BoringSSL, and OQS-OpenSSH will also need to be ready for review and merge by the time this is merged.)

Copy link
Member

@baentsch baentsch left a comment

Choose a reason for hiding this comment

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

Is the term "...or..." between the licenses correct/sensible? I'm not a lawyer, but those guys could understand "or" to mean "the stricter of the two". What's your (lawyer's) take, @beldmit as you raised the issue in #1388? Does this resolve the "CC0" problem for Fedora? Is it OK we still only have CC0 for ARM?

Copy link
Member

@baentsch baentsch left a comment

Choose a reason for hiding this comment

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

As this change presumably gives OQS more legal freedom & wider acceptance, good for me too. Will merge early next week if no objections heard by @beldmit.

@beldmit
Copy link
Contributor

beldmit commented Feb 24, 2023

Thank you very much! It's a significant step forward!

@baentsch
Copy link
Member

Thank you very much! It's a significant step forward!

Re-reviewing things I wonder whether there's now a mismatch between upstream repo and liboqs wrt Dilithium: @bhess you manually changed the README for Dilithium, but the copy_from_upstream didn't modify the algorithm documentation, so this PR now introduces conflicting license statements (between https://github.com/open-quantum-safe/liboqs/tree/bhe-crystallic#license and https://github.com/open-quantum-safe/liboqs/blob/bhe-crystallic/docs/algorithms/sig/dilithium.md ): Is that truly intentional?

@bhess
Copy link
Member Author

bhess commented Feb 24, 2023

@bhess you manually changed the README for Dilithium, but the copy_from_upstream didn't modify the algorithm documentation, so this PR now introduces conflicting license statements (between https://github.com/open-quantum-safe/liboqs/tree/bhe-crystallic#license and https://github.com/open-quantum-safe/liboqs/blob/bhe-crystallic/docs/algorithms/sig/dilithium.md ): Is that truly intentional?

Oh I missed to update the algorithm documentation yml/md for both Dilithium and Kyber, will add it with a commit. Thanks for noticing.
Dilithium didn't need to be updated since the dual license was already added the last time we pulled from upstream, but copy_from_upstream doesn't update license identifiers.

@baentsch baentsch merged commit 341cf22 into main Feb 25, 2023
@baentsch baentsch deleted the bhe-crystallic branch February 25, 2023 07:20
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.

Pull Kyber update, update Kyber and Dilithium licenses
4 participants