remove a ton of trusted annotations, label the others (#22)

Author: vrindisbacher

capsules/system/src/process_checker/basic.rs

@@ -99,7 +99,6 @@ pub struct AppCheckerSha256 {
 }
 
 impl AppCheckerSha256 {
-    #[flux_rs::trusted]
     pub fn new(
         hash: &'static dyn Sha256Verifier<'static>,
         buffer: &'static mut [u8; 32],
@@ -118,7 +117,7 @@ impl AppCredentialsPolicy<'static> for AppCheckerSha256 {
     fn require_credentials(&self) -> bool {
         true
     }
-    #[flux_rs::trusted]
+
     fn check_credentials(
         &self,
         credentials: TbfFooterV2Credentials,
@@ -139,15 +138,15 @@ impl AppCredentialsPolicy<'static> for AppCheckerSha256 {
             _ => Err((ErrorCode::NOSUPPORT, credentials, binary)),
         }
     }
-    #[flux_rs::trusted]
+
     fn set_client(&self, client: &'static dyn AppCredentialsPolicyClient<'static>) {
         self.client.replace(client);
     }
 }
 
 impl ClientData<32_usize> for AppCheckerSha256 {
     fn add_mut_data_done(&self, _result: Result<(), ErrorCode>, _data: SubSliceMut<'static, u8>) {}
-    #[flux_rs::trusted]
+
     fn add_data_done(&self, result: Result<(), ErrorCode>, data: SubSlice<'static, u8>) {
         match result {
             Err(e) => panic!("Internal error during application binary checking. SHA256 engine threw error in adding data: {:?}", e),
@@ -161,7 +160,6 @@ impl ClientData<32_usize> for AppCheckerSha256 {
 }
 
 impl ClientVerify<32_usize> for AppCheckerSha256 {
-    #[flux_rs::trusted]
     fn verification_done(
         &self,
         result: Result<bool, ErrorCode>,
@@ -218,7 +216,6 @@ pub struct AppIdAssignerNames<'a, F: Fn(&'static str) -> u32> {
     hasher: &'a F,
 }
 
-#[flux_rs::trusted]
 impl<'a, F: Fn(&'static str) -> u32> AppIdAssignerNames<'a, F> {
     pub fn new(hasher: &'a F) -> Self {
         Self { hasher }
@@ -248,7 +245,6 @@ impl<'a, F: Fn(&'static str) -> u32> AppUniqueness for AppIdAssignerNames<'a, F>
 }
 
 impl<'a, F: Fn(&'static str) -> u32> Compress for AppIdAssignerNames<'a, F> {
-    #[flux_rs::trusted]
     fn to_short_id(&self, process: &ProcessBinary) -> ShortId {
         let name = process.header.get_package_name().unwrap_or("");
         let sum = (self.hasher)(name);
@@ -271,7 +267,6 @@ pub struct AppCheckerRsaSimulated<'a> {
     binary: OptionalCell<&'a [u8]>,
 }
 
-#[flux_rs::trusted]
 impl<'a> AppCheckerRsaSimulated<'a> {
     pub fn new() -> AppCheckerRsaSimulated<'a> {
         Self {
@@ -284,7 +279,6 @@ impl<'a> AppCheckerRsaSimulated<'a> {
 }
 
 impl<'a> DeferredCallClient for AppCheckerRsaSimulated<'a> {
-    #[flux_rs::trusted]
     fn handle_deferred_call(&self) {
         // This checker does not actually verify the RSA signature; it
         // assumes the signature is valid and so accepts any RSA
@@ -330,7 +324,7 @@ impl<'a> AppCredentialsPolicy<'a> for AppCheckerRsaSimulated<'a> {
             Err((ErrorCode::BUSY, credentials, binary))
         }
     }
-    #[flux_rs::trusted]
+
     fn set_client(&self, client: &'a dyn AppCredentialsPolicyClient<'a>) {
         self.client.replace(client);
     }

capsules/system/src/process_checker/signature.rs

@@ -47,7 +47,6 @@ impl<
         const SL: usize,
     > AppCheckerSignature<'a, S, H, HL, SL>
 {
-    #[flux_rs::trusted]
     pub fn new(
         hasher: &'a H,
         verifier: &'a S,
@@ -77,7 +76,7 @@ impl<
     > hil::digest::ClientData<HL> for AppCheckerSignature<'a, S, H, HL, SL>
 {
     fn add_mut_data_done(&self, _result: Result<(), ErrorCode>, _data: SubSliceMut<'static, u8>) {}
-    #[flux_rs::trusted]
+
     fn add_data_done(&self, result: Result<(), ErrorCode>, data: SubSlice<'static, u8>) {
         self.binary.set(data.take());
 
@@ -104,7 +103,7 @@ impl<
         }
     }
 }
-#[flux_rs::trusted]
+
 impl<
         'a,
         S: hil::public_key_crypto::signature::SignatureVerify<'static, HL, SL>,
@@ -161,7 +160,7 @@ impl<
         // Needed to make the sha256 client work.
     }
 }
-#[flux_rs::trusted]
+
 impl<
         'a,
         S: hil::public_key_crypto::signature::SignatureVerify<'static, HL, SL>,
@@ -193,7 +192,7 @@ impl<
         });
     }
 }
-#[flux_rs::trusted]
+
 impl<
         'a,
         S: hil::public_key_crypto::signature::SignatureVerify<'static, HL, SL>,

flux_support/src/flux_arr.rs

@@ -11,43 +11,43 @@ pub struct RArray<T: Copy + Display> {
 }
 
 impl<T: Copy + Display> RArray<T> {
-    #[flux_rs::trusted]
+    #[flux_rs::trusted(reason = "flux wrappers")]
     #[flux_rs::sig(fn (arr: [T; 8]) -> Self)]
     pub const fn new(arr: [T; 8]) -> Self {
         Self { arr }
     }
 
-    #[flux_rs::trusted]
+    #[flux_rs::trusted(reason = "flux wrappers")]
     #[flux_rs::sig(fn (&Self[@arr], { usize[@idx] | idx < 8 }) -> T[map_select(arr, idx)])]
     pub fn get(&self, idx: usize) -> T {
         self.arr[idx]
     }
 
-    #[flux_rs::trusted]
+    #[flux_rs::trusted(reason = "flux wrappers")]
     #[flux_rs::sig(fn (self: &strg Self[@arr], { usize[@idx] | idx < 8 }, item: T) ensures self: Self[map_store(arr, idx, item)])]
     pub fn set(&mut self, idx: usize, item: T) {
         self.arr[idx] = item;
     }
 
-    #[flux_rs::trusted]
+    #[flux_rs::trusted(reason = "flux wrappers")]
     #[flux_rs::sig(fn (&Self) -> usize[8])]
     pub fn len(&self) -> usize {
         self.arr.len()
     }
 
-    #[flux_rs::trusted]
+    #[flux_rs::trusted(reason = "flux wrappers")]
     pub fn iter_mut(&mut self) -> IterMut<T> {
         self.arr.iter_mut()
     }
 
-    #[flux_rs::trusted]
+    #[flux_rs::trusted(reason = "flux wrappers")]
     pub fn iter(&self) -> Iter<T> {
         self.arr.iter()
     }
 }
 
 impl<T: Display + Copy> Display for RArray<T> {
-    #[flux_rs::trusted]
+    #[flux_rs::trusted(reason = "flux wrappers")]
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         for item in self.arr.iter() {
             f.write_fmt(format_args!("{}", item))?;