Skip to content

fix(dtls): replace panicking unwrap/expect in crypto hot paths #68

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

Open
nightness wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(dtls): replace panicking unwrap/expect in crypto hot paths #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions rtc-dtls/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ impl ConfigBuilder {
gen_self_signed_root_cert(),
))
.build()
.unwrap(),
.map_err(|e| Error::Other(e.to_string()))?,
client_cert_verifier: None,
retransmit_interval,
initial_epoch: 0,
Expand Down Expand Up @@ -441,11 +441,12 @@ impl Default for HandshakeConfig {
insecure_verification: false,
verify_peer_certificate: None,
roots_cas: rustls::RootCertStore::empty(),
// Safety: gen_self_signed_root_cert uses hardcoded empty subject; build() cannot fail.
server_cert_verifier: rustls::client::WebPkiServerVerifier::builder(Arc::new(
gen_self_signed_root_cert(),
))
.build()
.unwrap(),
.expect("WebPkiServerVerifier::build with self-signed root cannot fail"),
client_cert_verifier: None,
retransmit_interval: std::time::Duration::from_secs(0),
initial_epoch: 0,
Expand Down
20 changes: 14 additions & 6 deletions rtc-dtls/src/crypto/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,13 @@ impl Certificate {
subject_alt_names: impl Into<Vec<String>>,
alg: &'static rcgen::SignatureAlgorithm,
) -> Result<Self> {
let params = rcgen::CertificateParams::new(subject_alt_names).unwrap();
let key_pair = rcgen::KeyPair::generate_for(alg).unwrap();
let cert = params.self_signed(&key_pair).unwrap();
let params = rcgen::CertificateParams::new(subject_alt_names)
.map_err(|e| Error::Other(e.to_string()))?;
let key_pair = rcgen::KeyPair::generate_for(alg)
.map_err(|e| Error::Other(e.to_string()))?;
let cert = params
.self_signed(&key_pair)
.map_err(|e| Error::Other(e.to_string()))?;

Ok(Certificate {
certificate: vec![cert.der().to_owned()],
Expand Down Expand Up @@ -179,10 +183,13 @@ impl PartialEq for CryptoPrivateKey {

impl Clone for CryptoPrivateKey {
fn clone(&self) -> Self {
// Safety: `serialized_der` is always produced by `from_key_pair` which serialises a
// valid key. Re-parsing the same bytes cannot fail, so these unwraps are sound.
match self.kind {
CryptoPrivateKeyKind::Ed25519(_) => CryptoPrivateKey {
kind: CryptoPrivateKeyKind::Ed25519(
Ed25519KeyPair::from_pkcs8_maybe_unchecked(&self.serialized_der).unwrap(),
Ed25519KeyPair::from_pkcs8_maybe_unchecked(&self.serialized_der)
.expect("CryptoPrivateKey::clone: Ed25519 DER re-parse failed"),
),
serialized_der: self.serialized_der.clone(),
},
Expand All @@ -193,13 +200,14 @@ impl Clone for CryptoPrivateKey {
&self.serialized_der,
&SystemRandom::new(),
)
.unwrap(),
.expect("CryptoPrivateKey::clone: ECDSA DER re-parse failed"),
),
serialized_der: self.serialized_der.clone(),
},
CryptoPrivateKeyKind::Rsa256(_) => CryptoPrivateKey {
kind: CryptoPrivateKeyKind::Rsa256(
ring::rsa::KeyPair::from_pkcs8(&self.serialized_der).unwrap(),
ring::rsa::KeyPair::from_pkcs8(&self.serialized_der)
.expect("CryptoPrivateKey::clone: RSA DER re-parse failed"),
),
serialized_der: self.serialized_der.clone(),
},
Expand Down
16 changes: 14 additions & 2 deletions rtc-dtls/src/flight/flight5.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,22 @@ impl Flight for Flight5 {

plain_text.extend_from_slice(&merged);

let cert_ref = certificate.as_ref().ok_or_else(|| {
(
Some(Alert {
alert_level: AlertLevel::Fatal,
alert_description: AlertDescription::InternalError,
}),
Some(Error::Other(
"no local certificate available for DTLS flight5".to_owned(),
)),
)
})?;

// Find compatible signature scheme
let signature_hash_algo = match select_signature_scheme(
&cfg.local_signature_schemes,
&certificate.as_ref().unwrap().private_key,
&cert_ref.private_key,
) {
Ok(s) => s,
Err(err) => {
Expand All @@ -414,7 +426,7 @@ impl Flight for Flight5 {

let cert_verify = match generate_certificate_verify(
&plain_text,
&certificate.as_ref().unwrap().private_key, /*, signature_hash_algo.hash*/
&cert_ref.private_key,
) {
Ok(cert) => cert,
Err(err) => {
Expand Down