Skip to content

Update rustls and webpki crates for new security advisories #3

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.

Sign up for GitHub

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

Merged
autoantohaki merged 3 commits into from
Oct 21, 2026
+27 −19
Merged

Update rustls and webpki crates for new security advisories #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6827a5c
Fix Linux build: convert rustix errors and satisfy clippy
autoantohaki Oct 21, 2026
17b7d33
Update rustls and webpki crates for new security advisories
autoantohaki Oct 21, 2026
f513894
Merge Linux build fix so CI can build this branch
autoantohaki Oct 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions THIRD_PARTY_LICENSES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ TEXT: a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 [crate] L
TEXT: a6c48161a09acc75a0e25503bab66a731eb5fba5392ed4bb4743e4ba5085327a [crate] LICENSE-Apache-2.0_WITH_LLVM-exception
TEXT: 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 [crate] LICENSE-MIT

PACKAGE: rustls 0.23.45
PACKAGE: rustls 0.23.46
DECLARED-LICENSE: Apache-2.0 OR ISC OR MIT
UPSTREAM: https://github.com/rustls/rustls
TEXT: a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 [crate] LICENSE-APACHE
Expand All @@ -1291,7 +1291,7 @@ UPSTREAM: https://github.com/rustls/pki-types
TEXT: 45fd05c4865e7c350b98ad7ac50e1b15462d49af4a91e9b0c9dd933dc9a69742 [crate] LICENSE-APACHE
TEXT: 9117d922e667125508dde62b02c1f57ed22f5ad21eb536aa2e2d99e1c796e639 [crate] LICENSE-MIT

PACKAGE: rustls-webpki 0.103.15
PACKAGE: rustls-webpki 0.103.16
DECLARED-LICENSE: ISC
UPSTREAM: https://github.com/rustls/webpki
TEXT: 5b698ca13897be3afdb7174256fa1574f8c6892b8bea1a66dd6469d3fe27885a [crate] LICENSE
Expand Down Expand Up @@ -1907,12 +1907,12 @@ UPSTREAM: https://github.com/daxpedda/web-time
TEXT: 54a744942eb3fa63a74d8d359989ed6962c04f3f10ff20cfa08ff8aa7efbe4e6 [crate] LICENSE-APACHE
TEXT: f428305bbf2e70fbd807af0f3c7ac1b7acfb95311640f451e9d2e48db6d7e96b [crate] LICENSE-MIT

PACKAGE: webpki-root-certs 1.0.9
PACKAGE: webpki-root-certs 1.0.10
DECLARED-LICENSE: CDLA-Permissive-2.0
UPSTREAM: https://github.com/rustls/webpki-roots
TEXT: e271993808fec50ab29350b39539cdec611a9103f827e0aa26d61da70e2d33f8 [crate] LICENSE

PACKAGE: webpki-roots 1.0.9
PACKAGE: webpki-roots 1.0.10
DECLARED-LICENSE: CDLA-Permissive-2.0
UPSTREAM: https://github.com/rustls/webpki-roots
TEXT: e271993808fec50ab29350b39539cdec611a9103f827e0aa26d61da70e2d33f8 [crate] LICENSE
Expand Down
8 changes: 4 additions & 4 deletions THIRD_PARTY_NOTICES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ The inventory below records declared package licenses. The corresponding copyrig
| `ring` | 0.17.14 | `Apache-2.0 AND ISC` | crates.io |
| `rustc-hash` | 2.1.3 | `Apache-2.0 OR MIT` | crates.io |
| `rustix` | 1.1.4 | `Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT` | crates.io |
| `rustls` | 0.23.45 | `Apache-2.0 OR ISC OR MIT` | crates.io |
| `rustls` | 0.23.46 | `Apache-2.0 OR ISC OR MIT` | crates.io |
| `rustls-pki-types` | 1.15.1 | `MIT OR Apache-2.0` | crates.io |
| `rustls-webpki` | 0.103.15 | `ISC` | crates.io |
| `rustls-webpki` | 0.103.16 | `ISC` | crates.io |
| `rustversion` | 1.0.23 | `MIT OR Apache-2.0` | crates.io |
| `ryu` | 1.0.23 | `Apache-2.0 OR BSL-1.0` | crates.io |
| `schannel` | 0.1.29 | `MIT` | crates.io |
Expand Down Expand Up @@ -294,8 +294,8 @@ The inventory below records declared package licenses. The corresponding copyrig
| `wasm-streams` | 0.4.2 | `MIT OR Apache-2.0` | crates.io |
| `web-sys` | 0.3.105 | `MIT OR Apache-2.0` | crates.io |
| `web-time` | 1.1.0 | `MIT OR Apache-2.0` | crates.io |
| `webpki-root-certs` | 1.0.9 | `CDLA-Permissive-2.0` | crates.io |
| `webpki-roots` | 1.0.9 | `CDLA-Permissive-2.0` | crates.io |
| `webpki-root-certs` | 1.0.10 | `CDLA-Permissive-2.0` | crates.io |
| `webpki-roots` | 1.0.10 | `CDLA-Permissive-2.0` | crates.io |
| `winapi` | 0.3.9 | `MIT/Apache-2.0` | crates.io |
| `winapi-i686-pc-windows-gnu` | 0.4.0 | `MIT/Apache-2.0` | crates.io |
| `winapi-x86_64-pc-windows-gnu` | 0.4.0 | `MIT/Apache-2.0` | crates.io |
Expand Down
7 changes: 7 additions & 0 deletions crates/impossible-models/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@ impl From<io::Error> for Error {
}
}

#[cfg(unix)]
impl From<rustix::io::Errno> for Error {
fn from(value: rustix::io::Errno) -> Self {
Self::Io(value.into())
}
}

impl From<reqwest::Error> for Error {
fn from(value: reqwest::Error) -> Self {
let kind = if value.is_connect() {
Expand Down
7 changes: 4 additions & 3 deletions crates/impossible-server-core/src/security.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ fn open_secret_file(path: &Path) -> Result<File, CredentialError> {
let mut options = OpenOptions::new();
options.read(true);
configure_no_follow(&mut options);
options.open(path).map_err(map_open_error)
options.open(path).map_err(|error| map_open_error(&error))
}

#[cfg(unix)]
Expand All @@ -136,9 +136,10 @@ fn configure_no_follow(options: &mut OpenOptions) {
#[cfg(not(any(unix, windows)))]
fn configure_no_follow(_options: &mut OpenOptions) {}

fn map_open_error(_error: std::io::Error) -> CredentialError {
#[cfg_attr(not(unix), allow(unused_variables))]
fn map_open_error(error: &std::io::Error) -> CredentialError {
#[cfg(unix)]
if _error.raw_os_error() == Some(libc::ELOOP) {
if error.raw_os_error() == Some(libc::ELOOP) {
return CredentialError::Invalid;
}
CredentialError::Unavailable
Expand Down
Loading