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

feat: switch from native-tls to rustls #879

Merged
merged 4 commits into from
Jun 9, 2023

Conversation

iamwacko
Copy link
Contributor

@iamwacko iamwacko commented May 7, 2023

Description of change

This PR changes native-tls to rustls on almost all of our dependencies. cargo-edit still technically depends on native-tls, but that is because it uses native-tls on architectures unsupported by rustls. Thanks to our dependency on cargo OpenSSL is still in the dependency tree, so I will hold off on actually merging this until the cargo library is completely removed, by me or someone else. Closes issue #873.

How Has This Been Tested (if applicable)?

It should just work, but I did compile and run it successfully. To check that native-tls wasn't anywhere in the dependency tree I ran cargo tree --target all -i native-tls.

@oddgrd oddgrd added SB2 labels May 8, 2023
Copy link
Contributor

@oddgrd oddgrd left a comment

Choose a reason for hiding this comment

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

Cool! I'm curious if we will have similar issues with other crates in the future if we don't use native-tls 🤔

By the way we use the vendored-openssl feature flag in our CI in a few places, this should also be updated. 🙏

@iamwacko iamwacko marked this pull request as ready for review June 6, 2023 14:03
@iamwacko
Copy link
Contributor Author

iamwacko commented Jun 6, 2023

#821 strikes again.

Copy link
Contributor

@oddgrd oddgrd left a comment

Choose a reason for hiding this comment

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

This LGTM except for one small comment!

e2e/Cargo.toml Outdated Show resolved Hide resolved
@jonaro00
Copy link
Member

jonaro00 commented Jun 8, 2023

Still waiting for #888 to remove cargo-edit for this to complete, right?

@iamwacko
Copy link
Contributor Author

iamwacko commented Jun 9, 2023

Still waiting for #888 to remove cargo-edit for this to complete, right?

Sort of, but not really. native-tls will still show up in the cargo tree, but it won't be compiled unless

[target.'cfg(not(any(target_arch = "x86_64", target_arch = "arm", target_arch = "x86", target_arch = "aarch64")))'.dependencies]`

See line 89 of this. What this means is that in practice native-tls is gone and OpenSSL with it.

Copy link
Contributor

@oddgrd oddgrd left a comment

Choose a reason for hiding this comment

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

Thanks!

@oddgrd oddgrd merged commit dfa4950 into shuttle-hq:main Jun 9, 2023
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.

3 participants