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

Nix libcrypto helpers #4422

Merged
merged 18 commits into from
Apr 25, 2024
Merged

Nix libcrypto helpers #4422

merged 18 commits into from
Apr 25, 2024

Conversation

dougch
Copy link
Contributor

@dougch dougch commented Feb 16, 2024

Resolved issues:

none

Description of changes:

Some of our tests expect environment variables to alternative libcrypto's to just work, and when entering a devShell interactively- it would be great to remind the user of what's available.

Note that regardless of what libcrypto CMAKE is pointing at, the other binaries should always be there, in this example openssl102 is the CMAKE target and we're still able to execute the 3.0 binary:

 % nix develop .#openssl102
Setting up openssl-1.0.2 enviornment from flake.nix...
nix/shell.sh: Entering a devShell
Libcrypto /nix/store/7mkz730iixhcjicykm4q8wljy40z72dn-openssl-1.0.2/bin/openssl available as openssl102
Libcrypto /nix/store/8dz8a4bs351h2dsdp23sm4qf994rbah4-openssl-1.1.1/bin/openssl available as openssl111
Libcrypto /nix/store/m8gcym1r6l4pnpzjlv5fkaskyzwvqp86-openssl-3.0.7/bin/openssl available as openssl30
Libcrypto /nix/store/49ivhb6z3k23qhx2vj3n53w4md1111as-aws-lc/bin/bssl available as bssl
Libcrypto /nix/store/bjqjkm7217x2grpkxbvdzchl8v52hxgl-libressl-3.6.1/bin/openssl available as libressl
[nix openssl-1.0.2] dougch@cusco:~/gitrepos/s2n-tls$ openssl30 version
OpenSSL 3.0.7 1 Nov 2022 (Library: OpenSSL 3.0.7 1 Nov 2022)

Call-outs:

This extends and replaces #4252

Testing:

How is this change tested (unit tests, fuzz tests, etc.)? local

Is this a refactor change? If so, how have you proved that the intended behavior hasn't changed?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@dougch dougch marked this pull request as ready for review February 16, 2024 21:25
@dougch dougch added the type/nix related to nix label Feb 20, 2024
@dougch dougch requested a review from jmayclin February 20, 2024 21:21
nix/shell.sh Outdated Show resolved Hide resolved
nix/shell.sh Outdated Show resolved Hide resolved
dougch and others added 2 commits February 29, 2024 13:12
Co-authored-by: James Mayclin <maycj@amazon.com>
@dougch dougch requested a review from jmayclin February 29, 2024 21:25
@dougch dougch enabled auto-merge (squash) March 14, 2024 23:20
@dougch dougch added the do_not_merge PR might needs something before merging, even if approved and passing label Mar 28, 2024
@dougch dougch removed the do_not_merge PR might needs something before merging, even if approved and passing label Mar 29, 2024
@dougch dougch merged commit 24fb0fc into aws:main Apr 25, 2024
32 checks passed
@dougch dougch deleted the nix_libcrypto_helpers branch April 25, 2024 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s2n-core team type/nix related to nix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants