Skip to content
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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ hyper-client = ["hyper", "hyper-tls"] #use features = ["hyper-client"], default-
hyper = { version = "^0.14", features = ["client", "http1"], optional = true }
hyper-tls = { version = "^0.5", optional = true }
isahc = { version = "^1.4.0", optional = true }
futures-lite = { version = "^1.12", optional = true }
futures-lite = { version = "2.5.0", optional = true }
http = "^0.2"
serde = "^1.0"
serde_json = "^1.0"
serde_derive = "^1.0"
jwt-simple = "0.11.2"
ece = "^2.2"
pem = "1.1.0"
pem = "3.0.4"
sec1_decode = "^0.1.0"
base64 = "^0.13"
chrono = "^0.4"
Expand Down
4 changes: 2 additions & 2 deletions src/vapid/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ impl<'a> VapidSignatureBuilder<'a> {
//Parse many PEM in the assumption of extra unneeded sections.
let parsed = pem::parse_many(&buffer).map_err(|_| WebPushError::InvalidCryptoKeys)?;

let found_pkcs8 = parsed.iter().any(|pem| pem.tag == "PRIVATE KEY");
let found_sec1 = parsed.iter().any(|pem| pem.tag == "EC PRIVATE KEY");
let found_pkcs8 = parsed.iter().any(|pem| pem.tag() == "PRIVATE KEY");
let found_sec1 = parsed.iter().any(|pem| pem.tag() == "EC PRIVATE KEY");

//Handle each kind of PEM file differently, as EC keys can be in SEC1 or PKCS8 format.
if found_sec1 {
Expand Down
Loading