Update cpufeatures fork #857
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cbeck88
reviewed
Jul 15, 2021
| @@ -39,7 +39,6 @@ mbedtls = { version = "0.8.1", default-features = false, features = ["no_std_dep | |||
| mbedtls-sys-auto = { version = "2.26.1", default-features = false, features = ["custom_threading"] } | |||
|
|
|||
| # We include these here so we can select in-the-enclave features | |||
| cpufeatures = { version = "0.1.5", features = ["compile-only"] } | |||
There was a problem hiding this comment.
So we're changing the patch version and removing it?
There was a problem hiding this comment.
cpufeatures is used directly by the RustCrypto crates (aes-gcm, sha2, maybe blake2, etc.).
This line was there to ensure the "compile-only" feature was turned on, via feature unification, but not actually used in the trusted crate.
Since feature unification doesn't work that way given how the RustCrypto crates use it, there's no need for this line to exist.
We still patch in our fork in the enclave so our fork is the one used by the upstream RustCrypto crates.
eranrund
approved these changes
Jul 16, 2021
cbeck88
approved these changes
Jul 16, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Due to issues with cargo feature unification, which is seemingly only exposed (sadly) when running on an actual enclave, we need to make our patches to
cpufeaturesjust usetarget_featuresdirectly.In this PR
cpufeaturesto one which works in our environment.Future Work