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

Upgrade to ring 0.17 #166

Merged
merged 2 commits into from
Oct 4, 2023
Merged

Upgrade to ring 0.17 #166

merged 2 commits into from
Oct 4, 2023

Conversation

thomaseizinger
Copy link
Contributor

@thomaseizinger thomaseizinger commented Oct 3, 2023

Reboot of #98.

This PR is a breaking change because the RcgenError::RingKeyRejected variant is changed AND because ring is part of the public API via the From impl for RcgenError.

@thomaseizinger
Copy link
Contributor Author

All commits pass clippy and formatting. Let me know if you want any of these to be split out into other PRs!

Copy link
Contributor

@iamjpotts iamjpotts left a comment

Choose a reason for hiding this comment

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

See discussion in #98 - was that drawn to a consensus wrt the additional parameter?

src/key_pair.rs Outdated Show resolved Hide resolved
src/key_pair.rs Outdated Show resolved Hide resolved
@djc
Copy link
Member

djc commented Oct 3, 2023

(FWIW, you had a nice commit history before but now there's a bunch of back and forth there... maybe use rebase -i to skip the commits that introduce the Cow and introduce ring to the public API, instead of reverting them with later commits?)

@thomaseizinger
Copy link
Contributor Author

(FWIW, you had a nice commit history before but now there's a bunch of back and forth there... maybe use rebase -i to skip the commits that introduce the Cow and introduce ring to the public API, instead of reverting them with later commits?)

Sure! I did see that you are not squash-merging in here so I figured you'd care about the commit history :)

@thomaseizinger thomaseizinger force-pushed the deps/bump-ring-0.17 branch 2 times, most recently from f4e5268 to 7c9b2d2 Compare October 3, 2023 08:02
@codecov
Copy link

codecov bot commented Oct 3, 2023

Codecov Report

Merging #166 (dc38152) into main (aaf4dd7) will decrease coverage by 0.04%.
The diff coverage is 76.92%.

@@            Coverage Diff             @@
##             main     #166      +/-   ##
==========================================
- Coverage   72.14%   72.11%   -0.04%     
==========================================
  Files           7        7              
  Lines        1881     1886       +5     
==========================================
+ Hits         1357     1360       +3     
- Misses        524      526       +2     
Files Coverage Δ
src/lib.rs 75.40% <ø> (ø)
src/error.rs 1.92% <0.00%> (ø)
src/key_pair.rs 72.00% <83.33%> (-0.28%) ⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@thomaseizinger
Copy link
Contributor Author

Sorry about the closing stuff, I fuffed around with rebase too much 😅

This PR is now entirely focused on upgrading ring.

src/key_pair.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
Copy link
Member

@est31 est31 left a comment

Choose a reason for hiding this comment

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

Okay except for the two comments by djc and cpu, where the one by djc can also be addressed in a subsequent PR (as long as it's done before a release).

@thomaseizinger
Copy link
Contributor Author

Okay except for the two comments by djc and cpu, where the one by djc can also be addressed in a subsequent PR (as long as it's done before a release).

Fixed! It is a breaking change so you might want to release a non-breaking one before merging this one.

@djc djc mentioned this pull request Oct 4, 2023
@djc djc added this pull request to the merge queue Oct 4, 2023
Merged via the queue into rustls:main with commit 948c3b5 Oct 4, 2023
14 of 15 checks passed
@djc djc mentioned this pull request Oct 18, 2023
@djc djc mentioned this pull request Jan 26, 2024
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.

5 participants