Skip to content

Fix RatlsError to MigrationResult conversion in RATLS setup #766

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
haitaohuang wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix RatlsError to MigrationResult conversion in RATLS setup #766

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
1d58654
Fix RatlsError to MigrationResult conversion in RATLS setup
haitaohuang Mar 26, 2026
cd960e2
Map quote generation failure to MutualAttestationError in SPDM path
haitaohuang Mar 26, 2026
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
2 changes: 1 addition & 1 deletion src/migtd/src/migration/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ impl From<RatlsError> for MigrationResult {
RatlsError::Crypto(_)
| RatlsError::X509(_)
| RatlsError::InvalidEventlog
| RatlsError::InvalidPolicy
| RatlsError::GenerateCertificate => MigrationResult::SecureSessionError,
RatlsError::InvalidPolicy => MigrationResult::InvalidPolicyError,
RatlsError::TdxModule(_) => MigrationResult::TdxModuleError,
RatlsError::GetQuote | RatlsError::VerifyQuote => {
MigrationResult::MutualAttestationError
Expand Down
9 changes: 5 additions & 4 deletions src/migtd/src/migration/rebinding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ async fn rebinding_new_prepare(
pre_session_data: Vec<u8>,
) -> Result<(), MigrationResult> {
// TLS server
let mut ratls_server = ratls::server_rebinding(transport, pre_session_data).map_err(|_| {
let mut ratls_server = ratls::server_rebinding(transport, pre_session_data).map_err(|e| {
#[cfg(feature = "vmcall-raw")]
data.extend_from_slice(
&format!(
Expand All @@ -654,10 +654,11 @@ async fn rebinding_new_prepare(
.into_bytes(),
);
log::error!(
"rebinding_new(): Failed in ratls transport. Migration ID: {}\n",
info.mig_request_id
"rebinding_new(): Failed in ratls transport. Migration ID: {} Error: {:?}\n",
info.mig_request_id,
e
);
MigrationResult::SecureSessionError
e
})?;

let rebind_token = tls_receive_rebind_token(&mut ratls_server).await?;
Expand Down
4 changes: 2 additions & 2 deletions src/migtd/src/migration/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ async fn migration_src_exchange_msk(
log::error!(migration_request_id = info.mig_info.mig_request_id;
"exchange_msk(): Failed in ratls client setup. Error: {:?}\n", e
);
MigrationResult::SecureSessionError
e
})?;

// MigTD-S send Migration Session Forward key to peer
Expand Down Expand Up @@ -830,7 +830,7 @@ async fn migration_dst_exchange_msk(
log::error!(migration_request_id = info.mig_info.mig_request_id;
"exchange_msk(): Failed in ratls server setup. Error: {:?}\n", e
);
MigrationResult::SecureSessionError
e
})?;

with_timeout(
Expand Down
4 changes: 2 additions & 2 deletions src/migtd/src/spdm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ pub fn gen_quote_spdm(report_data: &[u8]) -> Result<Vec<u8>, MigrationResult> {
additional_data[..hash.len()].copy_from_slice(hash.as_ref());
let td_report = tdx_tdcall::tdreport::tdcall_report(&additional_data)?;

let res =
attestation::get_quote(td_report.as_bytes()).map_err(|_| MigrationResult::Unsupported)?;
let res = attestation::get_quote(td_report.as_bytes())
.map_err(|_| MigrationResult::MutualAttestationError)?;
Ok(res)
}

Expand Down
Loading