Skip to content

Commit

Permalink
vtpm: add extend functionality
Browse files Browse the repository at this point in the history
This can be used to perform runtime measurements

Signed-off-by: Magnus Kulke <[email protected]>
  • Loading branch information
mkulke committed Jul 1, 2024
1 parent cbf663d commit fff44a8
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 3 deletions.
2 changes: 1 addition & 1 deletion az-cvm-vtpm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ serde_json.workspace = true
serde-big-array = "0.5.1"
sev.workspace = true
thiserror.workspace = true
tss-esapi = "7.4"
tss-esapi = "7.5"
zerocopy.workspace = true

[features]
Expand Down
60 changes: 58 additions & 2 deletions az-cvm-vtpm/src/vtpm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
use serde::{Deserialize, Serialize};
use thiserror::Error;
use tss_esapi::abstraction::{nv, pcr, public::DecodedKey};
use tss_esapi::handles::TpmHandle;
use tss_esapi::handles::{PcrHandle, TpmHandle};
use tss_esapi::interface_types::algorithm::HashingAlgorithm;
use tss_esapi::interface_types::resource_handles::NvAuth;
use tss_esapi::interface_types::session_handles::AuthSession;
use tss_esapi::structures::pcr_selection_list::PcrSelectionListBuilder;
use tss_esapi::structures::pcr_slot::PcrSlot;
use tss_esapi::structures::{Attest, AttestInfo, Data, Signature, SignatureScheme};
use tss_esapi::structures::{Attest, AttestInfo, Data, DigestValues, Signature, SignatureScheme};
use tss_esapi::tcti_ldr::{DeviceConfig, TctiNameConf};
use tss_esapi::traits::{Marshall, UnMarshall};
use tss_esapi::Context;
Expand Down Expand Up @@ -50,6 +50,36 @@ const VTPM_QUOTE_PCR_SLOTS: [PcrSlot; 24] = [
PcrSlot::Slot23,
];

fn to_pcr_handle(pcr: u8) -> Result<PcrHandle, ExtendError> {
match pcr {
0 => Ok(PcrHandle::Pcr0),
1 => Ok(PcrHandle::Pcr1),
2 => Ok(PcrHandle::Pcr2),
3 => Ok(PcrHandle::Pcr3),
4 => Ok(PcrHandle::Pcr4),
5 => Ok(PcrHandle::Pcr5),
6 => Ok(PcrHandle::Pcr6),
7 => Ok(PcrHandle::Pcr7),
8 => Ok(PcrHandle::Pcr8),
9 => Ok(PcrHandle::Pcr9),
10 => Ok(PcrHandle::Pcr10),
11 => Ok(PcrHandle::Pcr11),
12 => Ok(PcrHandle::Pcr12),
13 => Ok(PcrHandle::Pcr13),
14 => Ok(PcrHandle::Pcr14),
15 => Ok(PcrHandle::Pcr15),
16 => Ok(PcrHandle::Pcr16),
17 => Ok(PcrHandle::Pcr17),
18 => Ok(PcrHandle::Pcr18),
19 => Ok(PcrHandle::Pcr19),
20 => Ok(PcrHandle::Pcr20),
21 => Ok(PcrHandle::Pcr21),
22 => Ok(PcrHandle::Pcr22),
23 => Ok(PcrHandle::Pcr23),
_ => Err(ExtendError::InvalidPcr),
}
}

#[derive(Error, Debug)]
pub enum ReportError {
#[error("tpm error")]
Expand All @@ -70,6 +100,32 @@ pub fn get_report() -> Result<Vec<u8>, ReportError> {
Ok(report)
}

#[derive(Error, Debug)]
pub enum ExtendError {
#[error("tpm error")]
Tpm(#[from] tss_esapi::Error),
#[error("invalid pcr number (expected 0-23)")]
InvalidPcr,
}

/// Extend a PCR register with a sha256 digest
pub fn extend_pcr(pcr: u8, digest: &[u8; 32]) -> Result<(), ExtendError> {
let pcr_handle = to_pcr_handle(pcr)?;

let mut vals = DigestValues::new();
let sha256_digest = digest.to_vec().try_into()?;
vals.set(HashingAlgorithm::Sha256, sha256_digest);

let conf: TctiNameConf = TctiNameConf::Device(DeviceConfig::default());
let mut context = Context::new(conf)?;

let auth_session = AuthSession::Password;
context.set_sessions((Some(auth_session), None, None));
context.pcr_extend(pcr_handle, vals)?;

Ok(())
}

#[derive(Error, Debug)]
pub enum AKPubError {
#[error("tpm error")]
Expand Down

0 comments on commit fff44a8

Please sign in to comment.