Skip to content

feat: consume openssl from openssl-sys#275

Merged
SWilson4 merged 5 commits intoopen-quantum-safe:mainfrom
jmayclin:cmake-from-ossl-sys
Jan 29, 2025
Merged

feat: consume openssl from openssl-sys#275
SWilson4 merged 5 commits intoopen-quantum-safe:mainfrom
jmayclin:cmake-from-ossl-sys

Conversation

@jmayclin
Copy link
Copy Markdown
Contributor

@jmayclin jmayclin commented Jan 25, 2025

Allow liboqs-rust to use the OpenSSL pulled in from openssl-sys.

If a rust project wants to link several things against OpenSSL, it is easiest to use the standard openssl-sys package. This PR adds a new feature vendored_openssl that will allow the vendored_openssl to be pulled in.

Callouts

I added this as a totally separate feature, which preserves the current OPENSSL_ROOT_DIR environment variable behavior. openssl-sys expects openssl to be specified with OPENSSL_DIR, so it would be a breaking change.

Alternately this "feature" could be the result if enabled both openssl and vendored. E.g., if you want a vendored liboqs then you might also want a vendored openssl?

Signed-off-by: James Mayclin <maycj@amazon.com>
Signed-off-by: James Mayclin <maycj@amazon.com>
Signed-off-by: James Mayclin <maycj@amazon.com>
@SWilson4
Copy link
Copy Markdown
Member

I think it makes sense to keep "vendored openssl" as a separate option from "vendored" (liboqs).

What do you think about adding CI tests for each option?

Signed-off-by: James Mayclin <maycj@amazon.com>
Signed-off-by: James Mayclin <maycj@amazon.com>
@jmayclin jmayclin force-pushed the cmake-from-ossl-sys branch from f0ef54e to 9b96c82 Compare January 28, 2025 00:02
@jmayclin
Copy link
Copy Markdown
Contributor Author

Thanks for the approval! Is there anything else needed to do before merging?

@SWilson4
Copy link
Copy Markdown
Member

Thanks for the approval! Is there anything else needed to do before merging?

Nope, I'll hit the merge button.

@SWilson4 SWilson4 added this pull request to the merge queue Jan 29, 2025
Merged via the queue into open-quantum-safe:main with commit 2bafcf1 Jan 29, 2025
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.

2 participants