Skip to content

fix: cargo audit warning for rustls-pemfile #565

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
alamb merged 2 commits into from
Dec 8, 2025
Merged

fix: cargo audit warning for rustls-pemfile #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf6f77f
fix: cargo audit warning for rustls-pemfile
mgattozzi Dec 5, 2025
32fc08a
fix: CI failures
mgattozzi Dec 8, 2025
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ quick-xml = { version = "0.38.0", features = ["serialize", "overlapped-lists"],
rand = { version = "0.9", default-features = false, features = ["std", "std_rng", "thread_rng"], optional = true }
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-native-roots", "http2"], optional = true }
ring = { version = "0.17", default-features = false, features = ["std"], optional = true }
rustls-pemfile = { version = "2.0", default-features = false, features = ["std"], optional = true }
rustls-pki-types = { version = "1.9", default-features = false, features = ["std"], optional = true }
serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
serde_json = { version = "1.0", default-features = false, features = ["std"], optional = true }
serde_urlencoded = { version = "0.7", optional = true }
Expand All @@ -74,7 +74,7 @@ default = ["fs"]
cloud = ["serde", "serde_json", "quick-xml", "hyper", "reqwest", "reqwest/stream", "chrono/serde", "base64", "rand", "ring", "http-body-util", "form_urlencoded", "serde_urlencoded"]
azure = ["cloud", "httparse"]
fs = ["walkdir"]
gcp = ["cloud", "rustls-pemfile"]
gcp = ["cloud", "rustls-pki-types"]
aws = ["cloud", "md-5"]
http = ["cloud"]
tls-webpki-roots = ["reqwest?/rustls-tls-webpki-roots"]
Expand Down
25 changes: 11 additions & 14 deletions src/gcp/credential.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ pub enum Error {
TokenResponseBody { source: HttpError },

#[error("Error reading pem file: {}", source)]
ReadPem { source: std::io::Error },
ReadPem {
source: rustls_pki_types::pem::Error,
},
}

impl From<Error> for crate::Error {
Expand Down Expand Up @@ -127,19 +129,14 @@ pub struct ServiceAccountKey(RsaKeyPair);
impl ServiceAccountKey {
/// Parses a pem-encoded RSA key
pub fn from_pem(encoded: &[u8]) -> Result<Self> {
use rustls_pemfile::Item;
use std::io::Cursor;

let mut cursor = Cursor::new(encoded);
let mut reader = BufReader::new(&mut cursor);

match rustls_pemfile::read_one(&mut reader) {
Ok(item) => match item {
Some(Item::Pkcs8Key(key)) => Self::from_pkcs8(key.secret_pkcs8_der()),
Some(Item::Pkcs1Key(key)) => Self::from_der(key.secret_pkcs1_der()),
_ => Err(Error::MissingKey),
},
Err(e) => Err(Error::ReadPem { source: e }),
use rustls_pki_types::PrivateKeyDer;
use rustls_pki_types::pem::PemObject;

match PrivateKeyDer::from_pem_slice(encoded) {
Ok(PrivateKeyDer::Pkcs8(key)) => Self::from_pkcs8(key.secret_pkcs8_der()),
Ok(PrivateKeyDer::Pkcs1(key)) => Self::from_der(key.secret_pkcs1_der()),
Ok(_) => Err(Error::MissingKey),
Err(source) => Err(Error::ReadPem { source }),
}
}

Expand Down