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

Uprev mobilecoin to latest master #105

Merged
merged 9 commits into from
Jul 27, 2021
Merged

Uprev mobilecoin to latest master #105

merged 9 commits into from
Jul 27, 2021

Conversation

jcape
Copy link
Contributor

@jcape jcape commented Jul 9, 2021

Motivation

This brings forward the latest changes from the mobilecoin repository, including updates to aes-gcm, grpc, and mbedtls.

In this PR

  • Uprev mobilecoin submodule
  • Remove aes-gcm cargo.io patch
  • Update sha2
  • Add patch for cpufeatures + feature-selection usage to enclaves

@jcape jcape requested review from eranrund, cbeck88 and a team July 9, 2021 22:28
@jcape jcape self-assigned this Jul 9, 2021
@jcape jcape added this to In progress in Consensus via automation Jul 9, 2021
@eranrund
Copy link
Contributor

eranrund commented Jul 9, 2021

Looks like #96 should've been merged prior to this.

@jcape
Copy link
Contributor Author

jcape commented Jul 9, 2021

Looks like #96 should've been merged prior to this.

I mean, sure, if you don't like duplicated effort ;-)

@eranrund
Copy link
Contributor

eranrund commented Jul 9, 2021

Looks like #96 should've been merged prior to this.

I mean, sure, if you don't like duplicated effort ;-)

That one also contains important cmake overrides for iOS builds :(

@jcape jcape marked this pull request as ready for review July 10, 2021 00:15
Consensus automation moved this from In progress to Reviewer approved Jul 13, 2021
@jcape jcape merged commit 54f5974 into mobilecoinfoundation:master Jul 27, 2021
Consensus automation moved this from Reviewer approved to Done Jul 27, 2021
@jcape jcape deleted the feature/uprev-2021-07-09.1 branch July 28, 2021 16:51
Consensus automation moved this from Done to Reviewer approved Aug 2, 2021
Consensus automation moved this from Reviewer approved to Done Aug 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Consensus
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants