Guest User

Untitled

a guest
Nov 4th, 2021
124
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.49 KB | None | 0 0
  1. [keylime@fedora rust-keylime]$ git diff upstream/master src/tpm.rs
  2. diff --git a/src/tpm.rs b/src/tpm.rs
  3. index f6ae1bb..c478431 100644
  4. --- a/src/tpm.rs
  5. +++ b/src/tpm.rs
  6. @@ -33,12 +33,12 @@ use tss_esapi::{
  7. },
  8. handles::{AuthHandle, KeyHandle, PcrHandle, SessionHandle},
  9. interface_types::{
  10. - algorithm::{AsymmetricAlgorithm, HashingAlgorithm, SignatureScheme},
  11. + algorithm::{AsymmetricAlgorithm, HashingAlgorithm, SignatureSchemeAlgorithm},
  12. session_handles::AuthSession,
  13. },
  14. structures::{
  15. Digest, DigestValues, EncryptedSecret, IDObject, Name,
  16. - PcrSelectionList, PcrSelectionListBuilder, PcrSlot,
  17. + PcrSelectionList, PcrSelectionListBuilder, PcrSlot, Signature
  18. },
  19. tcti_ldr::TctiNameConf,
  20. tss2_esys::{
  21. @@ -47,7 +47,7 @@ use tss_esapi::{
  22. TPML_DIGEST, TPML_PCR_SELECTION, TPMS_ATTEST, TPMS_SCHEME_HASH,
  23. TPMT_SIGNATURE, TPMT_SIG_SCHEME, TPMU_SIG_SCHEME,
  24. },
  25. - utils::{PcrData, Signature},
  26. + utils::PcrData,
  27. Context,
  28. };
  29.  
  30. @@ -110,7 +110,7 @@ pub(crate) fn create_ek(
  31. }
  32. };
  33. let (tpm_pub, _, _) = context.read_public(handle)?;
  34. - let tpm_pub_vec = pub_to_vec(tpm_pub);
  35. + let tpm_pub_vec = pub_to_vec(tpm_pub.into());
  36. :
  37. },
  38. structures::{
  39. Digest, DigestValues, EncryptedSecret, IDObject, Name,
  40. - PcrSelectionList, PcrSelectionListBuilder, PcrSlot,
  41. + PcrSelectionList, PcrSelectionListBuilder, PcrSlot, Signature
  42. },
  43. tcti_ldr::TctiNameConf,
  44. tss2_esys::{
  45. @@ -47,7 +47,7 @@ use tss_esapi::{
  46. TPML_DIGEST, TPML_PCR_SELECTION, TPMS_ATTEST, TPMS_SCHEME_HASH,
  47. TPMT_SIGNATURE, TPMT_SIG_SCHEME, TPMU_SIG_SCHEME,
  48. },
  49. - utils::{PcrData, Signature},
  50. + utils::PcrData,
  51. Context,
  52. };
  53.  
  54. @@ -110,7 +110,7 @@ pub(crate) fn create_ek(
  55. }
  56. };
  57. let (tpm_pub, _, _) = context.read_public(handle)?;
  58. - let tpm_pub_vec = pub_to_vec(tpm_pub);
  59. + let tpm_pub_vec = pub_to_vec(tpm_pub.into());
  60.  
  61. Ok((handle, cert, tpm_pub_vec))
  62. }
  63. @@ -239,12 +239,12 @@ pub(crate) fn create_ak(
  64. ctx,
  65. :
  66. },
  67. structures::{
  68. Digest, DigestValues, EncryptedSecret, IDObject, Name,
  69. - PcrSelectionList, PcrSelectionListBuilder, PcrSlot,
  70. + PcrSelectionList, PcrSelectionListBuilder, PcrSlot, Signature
  71. },
  72. tcti_ldr::TctiNameConf,
  73. tss2_esys::{
  74. @@ -47,7 +47,7 @@ use tss_esapi::{
  75. TPML_DIGEST, TPML_PCR_SELECTION, TPMS_ATTEST, TPMS_SCHEME_HASH,
  76. TPMT_SIGNATURE, TPMT_SIG_SCHEME, TPMU_SIG_SCHEME,
  77. },
  78. - utils::{PcrData, Signature},
  79. + utils::PcrData,
  80. Context,
  81. };
  82.  
  83. @@ -110,7 +110,7 @@ pub(crate) fn create_ek(
  84. }
  85. };
  86. let (tpm_pub, _, _) = context.read_public(handle)?;
  87. - let tpm_pub_vec = pub_to_vec(tpm_pub);
  88. + let tpm_pub_vec = pub_to_vec(tpm_pub.into());
  89.  
  90. Ok((handle, cert, tpm_pub_vec))
  91.  
  92. @@ -239,12 +239,12 @@ pub(crate) fn create_ak(
  93. ctx,
  94. handle,
  95. HashingAlgorithm::Sha256,
  96. - SignatureScheme::RsaSsa,
  97. + SignatureSchemeAlgorithm::RsaSsa,
  98. None,
  99. DefaultKey,
  100. )?;
  101. - let ak_tpm2b_pub = ak.out_public;
  102. - let tpm2_pub_vec = pub_to_vec(ak_tpm2b_pub);
  103. + let ak_tpm2b_pub = ak.out_public.clone();
  104. + let tpm2_pub_vec = pub_to_vec(ak_tpm2b_pub.into());
  105. let ak_handle =
  106. ak::load_ak(ctx, handle, None, ak.out_private, ak.out_public)?;
  107. let (_, name, _) = ctx.read_public(ak_handle)?;
Advertisement
Add Comment
Please, Sign In to add comment