Skip to content

Commit

Permalink
fix: check the device certificate chain
Browse files Browse the repository at this point in the history
Currently all the device certificates are trusted as long as
the certificate chain is correct but it's not possible
to decide which root CA certifcates are trusted or not.

This patch loads the manufacturer trusted CA certs when specified
in `trusted_manufacturer_keys` configuration variable and verifies
that the device certificate chain is signed by a trusted CA failing
otherwise. If no `trusted_manufacturer_keys` is configured the
previous behavior is maintained.

Signed-off-by: Miguel Martín <[email protected]>
  • Loading branch information
mmartinv committed Apr 2, 2024
1 parent df60316 commit 1b45061
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions rendezvous-server/src/handlers_to0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,14 @@ pub(super) async fn ownersign(
}
Some(v) => v,
};
//let device_pubkey = match device_cert_chain.verify_from_x5bag(&user_data.trusted_device_keys) {
let device_pubkey = match device_cert_chain.insecure_verify_without_root_verification() {

let device_pubkey_verification = if let Some(trusted_manufacturer_certs) = &user_data.trusted_manufacturer_keys {
device_cert_chain.verify_from_x5bag(trusted_manufacturer_certs)
} else {
device_cert_chain.insecure_verify_without_root_verification()
};

let device_pubkey = match device_pubkey_verification {
Err(cert_chain_err) => {
log::debug!("Error verifying device certificate: {:?}", cert_chain_err);
return Err(Error::new(
Expand Down

0 comments on commit 1b45061

Please sign in to comment.