|
3 | 3 | // SPDX-License-Identifier: Apache-2.0 |
4 | 4 |
|
5 | 5 | use anyhow::Result; |
6 | | -use dcap_qvl::QuoteCollateralV3; |
7 | 6 | use dcap_qvl::quote::{ |
8 | 7 | AuthData, AuthDataV4, CertificationData, Data, EnclaveReport, Header, |
9 | 8 | QEReportCertificationData, Quote, Report, TDReport10, |
10 | 9 | }; |
11 | | -use p256::ecdsa::{Signature, SigningKey, signature::Signer}; |
| 10 | +use dcap_qvl::QuoteCollateralV3; |
| 11 | +use p256::ecdsa::{signature::Signer, Signature, SigningKey}; |
12 | 12 | use p256::pkcs8::{DecodePrivateKey, EncodePrivateKey}; |
13 | 13 | use rcgen::{ |
14 | 14 | BasicConstraints, Certificate, CertificateParams, CertificateRevocationListParams, |
15 | 15 | CertifiedKey, CustomExtension, DnType, ExtendedKeyUsagePurpose, IsCa, KeyIdMethod, KeyPair, |
16 | | - KeyUsagePurpose, PKCS_ECDSA_P256_SHA256, RemoteKeyPair, SerialNumber, SignatureAlgorithm, |
| 16 | + KeyUsagePurpose, RemoteKeyPair, SerialNumber, SignatureAlgorithm, PKCS_ECDSA_P256_SHA256, |
17 | 17 | }; |
18 | 18 | use scale::Encode; |
19 | 19 | use serde_json::json; |
@@ -142,11 +142,11 @@ impl TdxGenerator { |
142 | 142 | pub fn root_ca_pem(&self) -> String { |
143 | 143 | self.root.pem() |
144 | 144 | } |
145 | | - pub fn root_key_pem(&self) -> String { |
146 | | - self.root_signing_key |
147 | | - .to_pkcs8_pem(Default::default()) |
148 | | - .expect("P-256 key serialization") |
149 | | - .to_string() |
| 145 | + pub fn root_key_pem(&self) -> Result<String> { |
| 146 | + Ok(self |
| 147 | + .root_signing_key |
| 148 | + .to_pkcs8_pem(Default::default())? |
| 149 | + .to_string()) |
150 | 150 | } |
151 | 151 |
|
152 | 152 | pub fn sample_collateral(&self) -> Result<QuoteCollateralV3> { |
@@ -446,14 +446,13 @@ mod tests { |
446 | 446 | ); |
447 | 447 | let mut tampered = evidence.quote.clone(); |
448 | 448 | tampered[100] ^= 1; |
449 | | - assert!( |
450 | | - verifier |
451 | | - .verify(&tampered, &evidence.collateral, now) |
452 | | - .is_err() |
453 | | - ); |
454 | | - assert!( |
455 | | - crate::ensure_report_data(&verified.report.as_td10().unwrap().report_data, &[0x24; 64]) |
456 | | - .is_err() |
457 | | - ); |
| 449 | + assert!(verifier |
| 450 | + .verify(&tampered, &evidence.collateral, now) |
| 451 | + .is_err()); |
| 452 | + assert!(crate::ensure_report_data( |
| 453 | + &verified.report.as_td10().unwrap().report_data, |
| 454 | + &[0x24; 64] |
| 455 | + ) |
| 456 | + .is_err()); |
458 | 457 | } |
459 | 458 | } |
0 commit comments