8000 build(deps): bump the cargo group across 1 directory with 8 updates by dependabot[bot] · Pull Request #596 · gominimal/minimal · GitHub
[go: up one dir, main page]

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
150 changes: 130 additions & 20 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
8000
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ rand = "0.10"
# WireGuard keypair generation (`networking-wg`).
rand_core = { version = "0.6", features = ["getrandom"] }
rayon = "1.12"
rcgen = { version = "0.13", default-features = false, features = ["crypto", "pem", "ring"] }
rcgen = { version = "0.14", default-features = false, features = ["crypto", "pem", "ring"] }
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
regex = "1" # keep in sync with nickel-lang-core
rustls = { version = "0.23", default-features = false, features = ["ring", "logging", "std"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }
Expand Down
18 changes: 9 additions & 9 deletions crates/minimald/src/net/proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,9 @@ pub struct CertAuthority {
pub server_cert_der: rustls::pki_types::CertificateDer<'static>,
/// Raw PKCS#8 bytes of the server's private key.
server_key_bytes: Vec< 8000 ;u8>,
/// The rcgen CA certificate, kept for signing client certificates.
ca_cert: rcgen::Certificate,
/// The rcgen CA key pair, kept for signing client certificates.
ca_key: rcgen::KeyPair,
/// The CA issuer (parameters plus key pair), kept for signing server and
/// client certificates.
issuer: rcgen::Issuer<'static, rcgen::KeyPair>,
}

#[cfg(feature = "networking-proxy")]
Expand Down Expand Up @@ -397,11 +396,13 @@ impl CertAuthority {
let ca_cert = ca_params.self_signed(&ca_key)?;
let ca_cert_der = rustls::pki_types::CertificateDer::from(ca_cert.der().to_vec());
let ca_cert_pem = ca_cert.pem();
// Retain the CA as an issuer so it can sign server and client certs.
let issuer = rcgen::Issuer::new(ca_params, ca_key);

// Server certificate signed by the CA.
let server_key = rcgen::KeyPair::generate()?;
let server_params = rcgen::CertificateParams::new(vec!["localhost".to_string()])?;
let server_cert = server_params.signed_by(&server_key, &ca_cert, &ca_key)?;
let server_cert = server_params.signed_by(&server_key, &issuer)?;
let server_cert_der = rustls::pki_types::CertificateDer::from(server_cert.der().to_vec());
let server_key_bytes = server_key.serialize_der();

Expand All @@ -410,8 +411,7 @@ impl CertAuthority {
ca_cert_pem,
server_cert_der,
server_key_bytes,
ca_cert,
ca_key,
issuer,
})
}

Expand All @@ -437,7 +437,7 @@ impl CertAuthority {
client_dn.push(rcgen::DnType::CommonName, subject_cn);
client_params.distinguished_name = client_dn;
client_params.extended_key_usages = vec![rcgen::ExtendedKeyUsagePurpose::ClientAuth];
let client_cert = client_params.signed_by(&client_key, &self.ca_cert, &self.ca_key)?;
let client_cert = client_params.signed_by(&client_key, &self.issuer)?;
Ok((client_cert.pem(), client_key.serialize_pem()))
}

Expand All @@ -463,7 +463,7 @@ impl CertAuthority {
client_dn.push(rcgen::DnType::CommonName, subject_cn);
client_params.distinguished_name = client_dn;
client_params.extended_key_usages = vec![rcgen::ExtendedKeyUsagePurpose::ClientAuth];
let client_cert = client_params.signed_by(&client_key, &self.ca_cert, &self.ca_key)?;
let client_cert = client_params.signed_by(&client_key, &self.issuer)?;
let cert_der = rustls::pki_types::CertificateDer::from(client_cert.der().to_vec());
let key_bytes = client_key.serialize_der();
Ok((cert_der, key_bytes))
Expand Down
2 changes: 1 addition & 1 deletion crates/rcache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
publish.workspace = true

[dev-dependencies]
mockall = "0.14"
mockall = "0.15"
tokio = { workspace = true, features = ["test-util"] }

[dependencies]
Expand Down
Loading
0