Fix warnings reports by MIRAI

Signed-off-by: Ceping Sun <cepingx.sun@intel.com>
sunceping · Sep 19, 2023 · c9c69ab · c9c69ab
1 parent 20d5e96
commit c9c69ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/attestation/src/root_ca.rs b/src/attestation/src/root_ca.rs
@@ -15,8 +15,12 @@ pub fn set_ca(cert: &'static [u8]) -> Result<(), Error> {
         .try_call_once(|| Certificate::from_der(cert))
         .map_err(|_| Error::InvalidRootCa)?;
 
-    if ROOT_CA
-        .get()
+    let cert = ROOT_CA.get();
+    if cert.is_none() {
+        return Err(Error::InvalidRootCa);
+    }
+
+    if cert
         .unwrap()
         .tbs_certificate
         .subject_public_key_info

diff --git a/src/crypto/src/ek_cert.rs b/src/crypto/src/ek_cert.rs
@@ -15,7 +15,7 @@ use crate::resolve::{
 };
 use crate::x509::{self, DistinguishedName, Extension};
 use crate::{
-    resolve::{ResolveError, ID_EC_PUBKEY_OID, SECP384R1_OID, VTPMTD_EXTENDED_KEY_USAGE},
+    resolve::{ResolveError, ID_EC_PUBKEY_OID, SECP384R1_OID},
     x509::{AlgorithmIdentifier, X509Error},
 };
 

diff --git a/src/tpm/src/tpm2_cmd_rsp/getcaps.rs b/src/tpm/src/tpm2_cmd_rsp/getcaps.rs
@@ -14,7 +14,7 @@ const TPM_CAP_TPM_PROPERTIES: u32 = 6;
 fn read_u32_from_bytes(bytes: &[u8], be: bool) -> u32 {
     let mut buf: [u8; 4] = [0; 4];
     buf.copy_from_slice(bytes);
-    let mut val: u32;
+    let val: u32;
     if be {
         val = u32::from_be_bytes(buf);
     } else {