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

Update dependencies #50

Merged
merged 7 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- stable
- beta
- nightly
- 1.51.0
os: [ubuntu-18.04]
- 1.59.0
os: [ubuntu-20.04]
# but only stable on macos/windows (slower platforms)
include:
- os: macos-latest
Expand Down
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "rustls-native-certs"
version = "0.6.2"
edition = "2018"
authors = ["Joseph Birr-Pixton <[email protected]>"]
license = "Apache-2.0/ISC/MIT"
edition = "2021"
rust-version = "1.59"
license = "Apache-2.0 OR ISC OR MIT"
readme = "README.md"
description = "rustls-native-certs allows rustls to use the platform native certificate store"
homepage = "https://github.com/ctz/rustls-native-certs"
Expand All @@ -17,10 +17,10 @@ rustls-pemfile = "1"
webpki = "0.22"
webpki-roots = "0.22"
ring = "0.16.5"
untrusted = "0.7.0"
untrusted = "0.7.0" # stick to the version ring depends on for now
rustls = "0.20"
x509-parser = "0.12"
serial_test = "0.6.0"
x509-parser = "0.14"
serial_test = "0.8" # later versions depend on dashmap, which requires a newer MSRV

[target.'cfg(windows)'.dependencies]
schannel = "0.1.15"
Expand Down
1 change: 0 additions & 1 deletion examples/print-trust-anchors.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//! Print the Subject of all extracted trust anchors.

use rustls_native_certs;
use std::error::Error;
use x509_parser::prelude::*;

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ fn load_certs_from_env() -> Option<Result<Vec<Certificate>, Error>> {
}

fn load_pem_certs(path: &Path) -> Result<Vec<Certificate>, Error> {
let f = File::open(&path)?;
let f = File::open(path)?;
let mut f = BufReader::new(f);

match rustls_pemfile::certs(&mut f) {
Expand Down