Skip to content

Add QE tcb date and status for MigTD attestation library #484

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
hyjiang wants to merge 1 commit into
base: migtd_1.23
Choose a base branch
from
Open

Add QE tcb date and status for MigTD attestation library #484

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
2 changes: 2 additions & 0 deletions QuoteGeneration/quote_wrapper/servtd_attest/inc/servtd_com.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ struct servtd_tdx_quote_suppl_data {
sgx_isv_svn_t isv_svn; /* 732 2 */
time_t tcb_date; /* 734 64 */
char tcb_status[TCB_STATUS_LEN]; /* 798 32 */
time_t qe_tcb_date; /* 830 64 */
char qe_tcb_status[TCB_STATUS_LEN]; /* 894 32 */
};

static const unsigned SERVTD_HEADER_SIZE = 4;
Expand Down
43 changes: 38 additions & 5 deletions QuoteVerification/QvE/Enclave/qve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
#ifdef SERVTD_ATTEST
#ifndef SGX_TRUSTED
#define SGX_TRUSTED
#include "TimeUtils.h"
#include <algorithm>
#endif
#include "servtd_utils.h"
#include "servtd_qve_utils.h"
Expand Down Expand Up @@ -957,6 +959,18 @@ static quote3_error_t qve_get_collateral_dates(const CertificateChain* p_cert_ch
}
#ifdef SERVTD_ATTEST

constexpr const char* tcbStatusToString(TcbStatus status)
{
switch (status) {
case TcbStatus::UpToDate: return "UpToDate";
case TcbStatus::ConfigurationNeeded: return "ConfigurationNeeded";
case TcbStatus::OutOfDate: return "OutOfDate";
case TcbStatus::OutOfDateConfigurationNeeded: return "OutOfDateConfigurationNeeded";
case TcbStatus::Revoked: return "Revoked";
default: return "Unknown";
}
}

/**
* @brief Get the matching QE TCB level based on ISVSVN
* @param enclaveIdentity The QE identity
Expand Down Expand Up @@ -1050,7 +1064,7 @@ static quote3_error_t servtd_set_quote_supplemental_data(
p_fmspc_size) != 0) {
return SGX_QL_ERROR_UNEXPECTED;
}
// get TCB date of TCB level in TCB Info
// get platform TCB date and TCB level in TCB Info
//
auto tcb = getMatchingTcbLevel(tcb_info_obj, pckCert, quote);
auto tdx_svn = tcb.getTdxTcbComponents();
Expand All @@ -1070,13 +1084,32 @@ static quote3_error_t servtd_set_quote_supplemental_data(
p_servtd_suppl_data->tcb_date = tcb.getTcbDate();

auto st = tcb.getStatus();
uint32_t len = st.length() + 1;
size_t len = st.length();

if (len > TCB_STATUS_LEN - 1)
return SGX_QL_ERROR_UNEXPECTED;

if (len > TCB_STATUS_LEN)
std::copy_n(st.c_str(), len, p_servtd_suppl_data->tcb_status);
p_servtd_suppl_data->tcb_status[len] = '\0';

// Get QE TCB date and TCB status
struct tm qe_date = qe_tcb_info.getTcbDate();
p_servtd_suppl_data->qe_tcb_date = ::mktime(&qe_date);
if (p_servtd_suppl_data->qe_tcb_date == -1) {
return SGX_QL_ERROR_UNEXPECTED;
}

auto qe_st = qe_tcb_info.getTcbStatus();
const char* qe_status_str = tcbStatusToString(qe_st);
size_t qe_status_len = strlen(qe_status_str);

if (qe_status_len > TCB_STATUS_LEN - 1) {
return SGX_QL_ERROR_UNEXPECTED;
}

std::copy_n(qe_status_str, qe_status_len, p_servtd_suppl_data->qe_tcb_status);

strncpy(p_servtd_suppl_data->tcb_status, st.c_str(), st.length());
p_servtd_suppl_data->tcb_status[st.length()] = '\0';
p_servtd_suppl_data->qe_tcb_status[qe_status_len] = '\0';

// Get Tdx Module major version
p_servtd_suppl_data->tdx_module_major_ver = quote.getTeeTcbSvn()[1];
Expand Down