Skip to content

Commit 9d2678a

Browse files
committed
Add infallible conversion for Name and CreationData
Signed-off-by: Wiktor Kwapisiewicz <[email protected]>
1 parent fff485e commit 9d2678a

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

tss-esapi/src/structures/creation.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,19 @@ impl TryFrom<TPM2B_CREATION_DATA> for CreationData {
4646
}
4747
}
4848

49-
impl TryFrom<CreationData> for TPMS_CREATION_DATA {
50-
type Error = Error;
51-
fn try_from(creation_data: CreationData) -> Result<Self> {
52-
Ok(TPMS_CREATION_DATA {
49+
impl From<CreationData> for TPMS_CREATION_DATA {
50+
fn from(creation_data: CreationData) -> Self {
51+
TPMS_CREATION_DATA {
5352
pcrSelect: creation_data.pcr_select.into(),
5453
pcrDigest: creation_data.pcr_digest.into(),
5554
locality: creation_data.locality,
5655
parentNameAlg: match creation_data.parent_name_alg {
5756
None => AlgorithmIdentifier::Null.into(),
5857
Some(alg) => alg.into(),
5958
},
60-
parentName: *creation_data.parent_name.as_ref(),
61-
parentQualifiedName: *creation_data.parent_qualified_name.as_ref(),
59+
parentName: creation_data.parent_name.into(),
60+
parentQualifiedName: creation_data.parent_qualified_name.into(),
6261
outsideInfo: creation_data.outside_info.into(),
63-
})
62+
}
6463
}
6564
}

tss-esapi/src/structures/names/name.rs

+6
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ impl TryFrom<TPM2B_NAME> for Name {
5454
}
5555
}
5656

57+
impl From<Name> for TPM2B_NAME {
58+
fn from(name: Name) -> Self {
59+
name.value
60+
}
61+
}
62+
5763
impl AsRef<TPM2B_NAME> for Name {
5864
fn as_ref(&self) -> &TPM2B_NAME {
5965
&self.value

0 commit comments

Comments
 (0)