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

make the provider-example library no-std compatible (almost) #1636

Merged
merged 5 commits into from
Dec 5, 2023

Conversation

japaric
Copy link
Contributor

@japaric japaric commented Nov 28, 2023

for use in in-tree examples.

this has been extracted out of #1534 and it's the part that has run into merge conflicts more often in the last few weeks so I'd like to land it ahead of time.

provider-example is almost no-std compatible because rustls is not no-std compatible until #1502 lands. still this PR gets more of the no-std compatibility done and only a few Cargo.toml changes are needed after #1502 lands.

the latest crates.io release of hpke is not no-std compatible but I've send a bunch of PRs to fix that

Copy link

codecov bot commented Nov 28, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (e051f5c) 95.90% compared to head (96a7a6f) 95.90%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1636   +/-   ##
=======================================
  Coverage   95.90%   95.90%           
=======================================
  Files          78       78           
  Lines       16083    16083           
=======================================
  Hits        15424    15424           
  Misses        659      659           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@japaric japaric mentioned this pull request Nov 28, 2023
1 task
@japaric
Copy link
Contributor Author

japaric commented Nov 29, 2023

the latest crates.io release of hpke is not no-std compatible but I've send a bunch of PRs to fix that

the git versions of the hpke-rs crates are now no-std compatible. I have requested for new releases on crates.io in franziskuskiefer/hpke-rs#60

@pvdrz pvdrz force-pushed the no-std-provider-example-lib branch 3 times, most recently from 2b9536b to d242a46 Compare December 5, 2023 19:31
@pvdrz
Copy link
Contributor

pvdrz commented Dec 5, 2023

I bumped the hpke crates versions and fixed some small incompatibilities. This is ready for review.

@@ -11,11 +11,11 @@ chacha20poly1305 = { version = "0.10.0", default-features = false, features = ["
der = "0.7.0"
ecdsa = "0.16.8"
hmac = "0.12.0"
hpke-rs = { version = "0.1.2", optional = true }
Copy link
Member

Choose a reason for hiding this comment

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

It would be good to move this commit up above "introduce a "std" Cargo feature", which should remove some of the back-and-forth

Copy link
Contributor

Choose a reason for hiding this comment

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

done

Copy link
Member

Choose a reason for hiding this comment

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

great, could you edit this part of the commit message?

hpke is gated behind the feature because as of v0.1.2 it does not have
no-std support

Copy link
Contributor

Choose a reason for hiding this comment

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

👍 I removed it

@pvdrz pvdrz force-pushed the no-std-provider-example-lib branch 2 times, most recently from c1a44ad to 96a7a6f Compare December 5, 2023 20:22
Copy link
Member

@ctz ctz left a comment

Choose a reason for hiding this comment

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

Thanks!

@ctz ctz enabled auto-merge December 5, 2023 20:26
@ctz ctz added this pull request to the merge queue Dec 5, 2023
Merged via the queue into rustls:main with commit f7c12c0 Dec 5, 2023
23 checks passed
@tshepang tshepang deleted the no-std-provider-example-lib branch December 6, 2023 05:52
@cpu cpu mentioned this pull request Dec 7, 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.

None yet

4 participants