clippy fixes

Author: vlad

check-hw/src/main.rs

@@ -24,7 +24,6 @@ use hyper::server::Server;
 use hyper::Client;
 use hyper::header::{AUTHORIZATION, ACCEPT, USER_AGENT};
 use base64::{engine::general_purpose, Engine as _};
-use hex;
 use sha2::{Sha256, Digest};
 use serde::Serialize;
 use crate::fs::OpenOptions;
@@ -105,7 +104,7 @@ fn log_request(remote_addr: SocketAddr, whole_body: &[u8]) -> std::io::Result<()
     let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
     let filename = format!("request_log_{}_{}_from_{}.txt", now.as_secs(), now.subsec_micros(), remote_addr);
 
-    let mut file = File::create(&filename)?;
+    let mut file = File::create(filename)?;
     file.write_all(whole_body)?;
 
     Ok(())
@@ -403,7 +402,7 @@ fn extract_cpu_cert_from_cert(cert_data: &[u8]) -> Option<Vec<u8>> {
     let b64_clean: String = b64.chars().filter(|c| !c.is_whitespace()).collect();
 
     // Decode Base64 into DER
-    let der_bytes = match base64::decode(&b64_clean) {
+    let der_bytes = match base64::decode(b64_clean) {
         Ok(x) => x,
         Err(_) => {
             return None;
@@ -452,7 +451,7 @@ unsafe fn extract_cpu_cert_from_quote(vec_quote: &[u8]) -> Option<Vec<u8>> {
                     let cert_data = (*auth_data_wrapper)
                         .auth_data
                         .as_ptr()
-                        .offset(auth_hdr_size as isize)
+                        .add(auth_hdr_size)
                         as *const sgx_ql_certification_data_t;
 
                     let cert_size_max = auth_size - mem::size_of::<sgx_ql_certification_data_t>();
@@ -491,7 +490,7 @@ fn extract_cpu_cert_from_attestation_combined<R: Read>(reader: &mut R) -> Result
     buf.resize(size_dcap_q as usize, 0);
     reader.read_exact(buf.as_mut_slice())?;
 
-    let ppid = unsafe { extract_cpu_cert_from_quote(&buf.as_slice()) };
+    let ppid = unsafe { extract_cpu_cert_from_quote(buf.as_slice()) };
 
     buf.resize(size_dcap_c as usize, 0);
     reader.read_exact(buf.as_mut_slice())?;
@@ -521,12 +520,12 @@ fn print_request_details(file_path: &std::path::Path, ip: IpAddr) {
     buf.resize(size_dcap_q as usize, 0);
     f_in.read_exact(buf.as_mut_slice()).unwrap();
 
-    let ppid = unsafe { extract_cpu_cert_from_quote(&buf.as_slice()) };
+    let ppid = unsafe { extract_cpu_cert_from_quote(buf.as_slice()) };
 
     buf.resize(size_dcap_c as usize, 0);
     f_in.read_exact(buf.as_mut_slice()).unwrap();
 
-    buf.resize(0, 0);
+    buf.clear();
     f_in.read_to_end(&mut buf).unwrap();
 
     println!("IP: {}", ip);
@@ -536,7 +535,7 @@ fn print_request_details(file_path: &std::path::Path, ip: IpAddr) {
     println!("Metadata: {}", &s);
 
     if let Some(ppid_val) = ppid {
-        println!("ppid: {}", hex::encode(&ppid_val));
+        println!("ppid: {}", hex::encode(ppid_val));
     }
 }
 

cosmwasm/enclaves/execute/src/registration/attestation.rs

@@ -92,7 +92,7 @@ impl KnownJwtKeys {
     fn add_key(&mut self, kid_b64: &str, n_b64: &str) -> Result<(), Box<dyn std::error::Error>> {
         let kid_bytes = base64::decode(kid_b64)?;
         let n_bytes = my_decode_base64(n_b64)?;
-        let e_bytes = [01_u8, 00_u8, 01_u8];
+        let e_bytes = [1_u8, 00_u8, 1_u8];
 
         // 2️⃣ Construct RSA public key
         let n = rsa::BigUint::from_bytes_be(&n_bytes);
@@ -326,20 +326,18 @@ impl AttestationCombined {
             // try to deserialize in a newer format
             let mut pos = 0;
             while pos + mem::size_of::<u32>() < blob_len {
-                let key = unsafe { *(blob_ptr.offset(pos as isize)) };
+                let key = unsafe { *(blob_ptr.add(pos)) };
                 pos += 1;
 
                 let value_size =
-                    u32::from_le(unsafe { *(blob_ptr.offset(pos as isize) as *const u32) })
-                        as usize;
+                    u32::from_le(unsafe { *(blob_ptr.add(pos) as *const u32) }) as usize;
                 pos += mem::size_of::<u32>();
 
                 if pos + value_size > blob_len {
                     break;
                 }
 
-                let value =
-                    unsafe { slice::from_raw_parts(blob_ptr.offset(pos as isize), value_size) };
+                let value = unsafe { slice::from_raw_parts(blob_ptr.add(pos), value_size) };
                 pos += value_size;
 
                 match key {
@@ -431,10 +429,7 @@ impl AttestationCombined {
                     let auth_size = auth_size_max - auth_hdr_size;
 
                     if auth_size > mem::size_of::<sgx_ql_certification_data_t>() {
-                        let cert_data = (*auth_data_wrapper)
-                            .auth_data
-                            .as_ptr()
-                            .offset(auth_hdr_size as isize)
+                        let cert_data = (*auth_data_wrapper).auth_data.as_ptr().add(auth_hdr_size)
                             as *const sgx_ql_certification_data_t;
 
                         let cert_size_max =
@@ -488,7 +483,7 @@ impl AttestationCombined {
         let b64_clean: String = b64.chars().filter(|c| !c.is_whitespace()).collect();
 
         // Decode Base64 into DER
-        let der_bytes = match base64::decode(&b64_clean) {
+        let der_bytes = match base64::decode(b64_clean) {
             Ok(x) => x,
             Err(_) => {
                 return None;
@@ -620,7 +615,7 @@ impl AttestationCombined {
             println!(
                 "quotehash masmatch. in-token: {}, actual: {}",
                 quotehash_str,
-                hex::encode(&quote_hash_actual)
+                hex::encode(quote_hash_actual)
             );
             return false;
         }
@@ -663,7 +658,7 @@ pub fn verify_quote_sgx(
                     if wl.contains(&ppid_addr) {
                         true
                     } else {
-                        println!("Unknown Machine ID: {}", orig_hex::encode(&ppid_addr));
+                        println!("Unknown Machine ID: {}", orig_hex::encode(ppid_addr));
                         false
                     }
                 }

cosmwasm/enclaves/execute/src/registration/offchain.rs

@@ -709,10 +709,10 @@ pub unsafe extern "C" fn ecall_onchain_approve_upgrade(
 fn calculate_machine_id_evidence(machine_id: &[u8]) -> [u8; HASH_SIZE] {
     let mut hasher = Sha256::new();
 
-    let magic = ['m' as u8, 'i' as u8, 'd' as u8, 0_u8];
-    hasher.update(&magic);
+    let magic = [b'm', b'i', b'd'];
+    hasher.update(magic);
 
-    hasher.update(&SELF_REPORT_BODY.mr_enclave.m);
+    hasher.update(SELF_REPORT_BODY.mr_enclave.m);
     hasher.update(machine_id);
 
     let mut ret = [0_u8; HASH_SIZE];
@@ -1230,7 +1230,7 @@ fn print_key_config_ex(seed: &enclave_crypto::Seed) {
     let node_pk = Keychain::generate_consensus_seed_exchange_keypair(seed).get_pubkey();
     let io_pk = Keychain::generate_consensus_io_exchange_keypair(seed).get_pubkey();
 
-    println!("{},{}", base64::encode(&node_pk), base64::encode(&io_pk));
+    println!("{},{}", base64::encode(node_pk), base64::encode(io_pk));
 }
 
 fn print_key_config() -> sgx_status_t {
@@ -1245,7 +1245,7 @@ fn print_key_config() -> sgx_status_t {
 
 fn print_key_config_rot(seed: &enclave_crypto::Seed) {
     println!("rot_seed pubkey");
-    print_key_config_ex(&seed);
+    print_key_config_ex(seed);
 }
 
 fn export_local_migration_report() -> sgx_status_t {

cosmwasm/enclaves/execute/src/registration/persistency.rs

@@ -13,7 +13,7 @@ pub fn write_master_pub_keys(key_manager: &Keychain) -> SgxResult<()> {
     write_public_key(kp, SEED_EXCH_KEY_SAVE_PATH)?;
 
     let kp = key_manager.get_consensus_io_exchange_keypair().unwrap();
-    write_public_key(&kp, IO_KEY_SAVE_PATH)?;
+    write_public_key(kp, IO_KEY_SAVE_PATH)?;
 
     Ok(())
 }