Skip to content

Update rustls to 0.23 and ring to 0.17 - #1715

Merged
djc merged 12 commits into
mainfrom
rustls-0.22
Apr 22, 2024
Merged

Update rustls to 0.23 and ring to 0.17#1715
djc merged 12 commits into
mainfrom
rustls-0.22

Conversation

@djc

@djc djc commented Dec 4, 2023

Copy link
Copy Markdown
Member

No description provided.

Comment thread quinn-proto/Cargo.toml Outdated
Comment thread quinn-proto/src/config.rs Outdated
Comment thread quinn-proto/src/config.rs
Comment thread quinn-proto/src/crypto/rustls.rs
Comment thread quinn-proto/src/crypto/rustls.rs
Comment thread quinn-proto/Cargo.toml Outdated
Comment thread quinn-proto/Cargo.toml Outdated
@getong

getong commented Dec 6, 2023

Copy link
Copy Markdown

I think you might also change the code in directory quinn/examples, like server.rs and client.rs.

rustls::Certificate has been replaced with CertificateDer from the new rustls-pki-types crate.
Likewise, rustls::PrivateKey has been replaced with rustls_pki_types::PrivateKeyDer.

The code in examples does not compile.

@djc

djc commented Dec 7, 2023

Copy link
Copy Markdown
Member Author

@getong there is a reason the PR is in draft state.

@PikuZheng

Copy link
Copy Markdown

In order to make ring support some architectures, I hope to upgrade ring to 0.17 as soon as possible

@cpu

This comment was marked as outdated.

@PikuZheng

Copy link
Copy Markdown

In order to make ring support some architectures, I hope to upgrade ring to 0.17 as soon as possible

@PikuZheng I believe ring 0.17 is already available with Quinn. The existing Quinn 0.10 release uses Rustls 0.21, which has upgraded to ring 0.17 as of v0.21.8. You don't need to wait for Quinn to have Rustls 0.22 support for this.

├── quinn v0.10.2
│   ├── bytes v1.5.0
│   ├── pin-project-lite v0.2.13
│   ├── quinn-proto v0.10.6
│   │   ├── bytes v1.5.0
│   │   ├── rand v0.8.5
│   │   │   ├── libc v0.2.151
│   │   │   ├── rand_chacha v0.3.1
│   │   │   │   ├── ppv-lite86 v0.2.17
│   │   │   │   └── rand_core v0.6.4
│   │   │   │       └── getrandom v0.2.11 (*)
│   │   │   └── rand_core v0.6.4 (*)
│   │   ├── ring v0.16.20
│   │   │   ├── libc v0.2.151
│   │   │   ├── once_cell v1.19.0
│   │   │   ├── spin v0.5.2
│   │   │   └── untrusted v0.7.1
│   │   ├── rustc-hash v1.1.0
│   │   ├── rustls v0.21.10 (*)
│   │   ├── slab v0.4.9 (*)
│   │   ├── thiserror v1.0.52 (*)
│   │   ├── tinyvec v1.6.0
│   │   │   └── tinyvec_macros v0.1.1
│   │   └── tracing v0.1.40 (*)

anything i'm missing?

@cpu

cpu commented Dec 27, 2023

Copy link
Copy Markdown
Contributor

anything i'm missing?

No, this was my mistake. I forgot Quinn also has ring in its public API and didn't take the breaking change to update to 0.17 in the 0.10 release like Rustls did.

Sorry for the confusion. There is a change required in this repo to remove ring 0.16 from the requirements.

Comment thread quinn-proto/src/crypto/rustls.rs Outdated
Comment thread quinn-proto/src/crypto/rustls.rs Outdated
Comment thread quinn-proto/src/crypto/rustls.rs Outdated
Comment thread quinn-proto/src/crypto/rustls.rs Outdated
Comment thread quinn-proto/src/crypto/rustls.rs
Comment thread quinn-proto/src/crypto/rustls.rs
Comment thread quinn-proto/src/tests/mod.rs Outdated
Comment thread quinn-proto/src/crypto/rustls.rs
Comment thread quinn-proto/src/crypto/rustls.rs
Comment thread quinn-proto/src/crypto/rustls.rs Outdated
@Ralith

Ralith commented Apr 11, 2024

Copy link
Copy Markdown
Collaborator

Made a deep pass; looks like only some minor cosmetic issues left.

@djc
djc force-pushed the rustls-0.22 branch 4 times, most recently from 702eaca to 39a45d4 Compare April 21, 2024 21:08
@djc
djc requested a review from Ralith April 21, 2024 21:09
@djc

djc commented Apr 21, 2024

Copy link
Copy Markdown
Member Author

@Ralith I think this is ready for another round -- hoping it will be the last one!

Comment thread quinn-proto/src/tests/mod.rs Outdated
Comment thread quinn-proto/src/crypto/rustls.rs Outdated
Comment thread quinn-proto/src/crypto/rustls.rs Outdated
djc and others added 4 commits April 22, 2024 09:34
@djc
djc merged commit ce13559 into main Apr 22, 2024
@djc
djc deleted the rustls-0.22 branch April 22, 2024 07:45
@djc

djc commented Apr 22, 2024

Copy link
Copy Markdown
Member Author

Release progress is tracked in #1737.

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.

6 participants