From aeffeba9fae695df9841ab42074cfaa8ccb113f9 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 29 May 2022 02:58:10 +0800 Subject: [PATCH] fix warnings that have cropped up --- services/root-keys/src/implementation.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/root-keys/src/implementation.rs b/services/root-keys/src/implementation.rs index e88b641c9..00cb7b2ad 100644 --- a/services/root-keys/src/implementation.rs +++ b/services/root-keys/src/implementation.rs @@ -2033,7 +2033,7 @@ impl<'a> RootKeys { let kernel_region = self.kernel(); let sig_region = &kernel_region[..core::mem::size_of::()]; let sig_rec: &SignatureInFlash = unsafe{(sig_region.as_ptr() as *const SignatureInFlash).as_ref().unwrap()}; // this pointer better not be null, we just created it! - let sig = Signature::new(sig_rec.signature); + let sig = Signature::from_bytes(&sig_rec.signature).expect("Signature malformed"); let kern_len = sig_rec.signed_len as usize; log::debug!("recorded kernel len: {} bytes", kern_len); @@ -2068,7 +2068,7 @@ impl<'a> RootKeys { *dst = src; } let sig_rec: &SignatureInFlash = unsafe{(sig_region.as_ptr() as *const SignatureInFlash).as_ref().unwrap()}; // this pointer better not be null, we just created it! - let sig = Signature::new(sig_rec.signature); + let sig = Signature::from_bytes(&sig_rec.signature).expect("Signature malformed"); log::debug!("sig_rec ({}): {:x?}", sig_rec.signed_len, sig_rec.signature); log::debug!("sig: {:x?}", sig.to_bytes()); log::debug!("pubkey: {:x?}", pubkey.to_bytes()); @@ -2100,7 +2100,7 @@ impl<'a> RootKeys { } } let sig_rec: &SignatureInFlash = unsafe{(sig_region.as_ptr() as *const SignatureInFlash).as_ref().unwrap()}; - let sig = Signature::new(sig_rec.signature); + let sig = Signature::from_bytes(&sig_rec.signature).expect("Signature malformed"); let mut sigtype = SignatureResult::SelfSignOk; // check against all the known signature types in detail