Update Rust deps, fix nested star panics + example

Author: DJAndries

build/rust/Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-nested-sta-rs = { path = "../../../../../nested-sta-rs" }
+nested-sta-rs = { git = "https://github.com/brave-experiments/nested-sta-rs", rev = "ad9816d4e14964f23680362c65bba8358dbe895a" }
 cxx = { path = "../../../third_party/rust/cxx/v1/crate" }
 # Use following cxx dep if compiling example via Makefile
 # cxx = "1.0"
@@ -17,3 +17,5 @@ name = "nested_star_cxx"
 crate-type = ["rlib"]
 # Use following crate type setting if compiling example via Makefile
 # crate-type = ["staticlib"]
+
+# Also, if compiling example, rename build.example.rs to build.rs

components/nested_star/Cargo.toml

@@ -32,6 +32,8 @@ int main(int argc, char** argv) {
     return 3;
   }
 
+  rand_resp.proofs.clear();
+
   auto msg_res = construct_message(rand_resp.points, rand_resp.proofs,
                                    *rrs_res.state, *public_key, {}, 50);
   if (msg_res.error.size() > 0) {

components/nested_star/build.rs components/nested_star/build.example.rscomponents/nested_star/build.rs renamed to components/nested_star/build.example.rs

@@ -106,8 +106,13 @@ pub fn prepare_measurement(
 }
 
 pub fn construct_randomness_request(rrs: &RandomnessRequestStateWrapper) -> Vec<VecU8> {
-    let res = client::construct_randomness_request(&rrs.0.as_ref().unwrap());
-    res.into_iter().map(|v| VecU8 { data: v }).collect()
+    match rrs.0.as_ref() {
+        Some(rrs) => {
+            let res = client::construct_randomness_request(rrs);
+            res.into_iter().map(|v| VecU8 { data: v }).collect()
+        }
+        None => Vec::new(),
+    }
 }
 
 pub fn construct_message(
@@ -118,19 +123,29 @@ pub fn construct_message(
     aux_bytes: &CxxVector<u8>,
     threshold: u32,
 ) -> ByteDataResult {
-    let rand_points_vec: Vec<&[u8]> = rand_points.iter().map(|v| v.data.as_slice()).collect();
-    let rand_proofs_vec: Vec<&[u8]> = rand_proofs.iter().map(|v| v.data.as_slice()).collect();
-    let res = client::construct_message(
-        &rand_points_vec,
-        if !rand_proofs.is_empty() { Some(&rand_proofs_vec) } else { None },
-        rrs.0.as_ref().unwrap(),
-        &verification_key.0,
-        aux_bytes.as_slice(),
-        threshold,
-    );
-    match res {
-        Ok(data) => ByteDataResult { data, error: String::new() },
-        Err(e) => ByteDataResult { data: Vec::new(), error: e.to_string() },
+    match rrs.0.as_ref() {
+        Some(rrs) => {
+            let rand_points_vec: Vec<&[u8]> =
+                rand_points.iter().map(|v| v.data.as_slice()).collect();
+            let rand_proofs_vec: Vec<&[u8]> =
+                rand_proofs.iter().map(|v| v.data.as_slice()).collect();
+            let res = client::construct_message(
+                &rand_points_vec,
+                if !rand_proofs.is_empty() { Some(&rand_proofs_vec) } else { None },
+                rrs,
+                &verification_key.0,
+                aux_bytes.as_slice(),
+                threshold,
+            );
+            match res {
+                Ok(data) => ByteDataResult { data, error: String::new() },
+                Err(e) => ByteDataResult { data: Vec::new(), error: e.to_string() },
+            }
+        }
+        None => ByteDataResult {
+            data: Vec::new(),
+            error: "Randomness request state is not present".to_string(),
+        },
     }
 }
 

components/nested_star/example/main.cc

@@ -93,6 +93,7 @@ source_set("unit_tests") {
     "//brave/components/brave_referrals/browser",
     "//brave/components/nested_star:cxx",
     "//brave/components/p3a",
+    "//brave/components/p3a:buildflags",
     "//components/prefs:test_support",
     "//content/test:test_support",
     "//net:net",

components/nested_star/src/lib.rs

@@ -61,6 +61,11 @@ class P3AMessageManagerTest : public testing::Test,
 
  protected:
   void SetUp() override {
+    base::Time future_mock_time;
+    if (base::Time::FromString("2050-01-04", &future_mock_time)) {
+      task_environment_.AdvanceClock(future_mock_time - base::Time::Now());
+    }
+
     p3a_config.disable_star_attestation = true;
     p3a_config.star_randomness_host = kTestHost;
     p3a_config.randomize_upload_interval = false;
@@ -120,7 +125,7 @@ class P3AMessageManagerTest : public testing::Test,
         }));
 
     message_manager.reset(new BraveP3AMessageManager(
-        &local_state, &p3a_config, this, "release", "2022-01-01"));
+        &local_state, &p3a_config, this, "release", "2099-01-01"));
 
     message_manager->Init(shared_url_loader_factory);
 

components/p3a/BUILD.gn

@@ -0,0 +1,12 @@
+diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc
+index 9f7a67788141d9a2ddc8095826d0e51b631f6a58..a762b3136c655056a7461b542b1e3762b4db9922 100644
+--- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc
++++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc
+@@ -41,6 +41,7 @@ BPKUR::KeyType AlgorithmToType(
+     case crypto::SignatureVerifier::RSA_PSS_SHA256:
+       return BPKUR::RSA_KEY;
+     case crypto::SignatureVerifier::ECDSA_SHA256:
++    case crypto::SignatureVerifier::ECDSA_SHA384:
+       return BPKUR::EC_KEY;
+   }
+ }

components/p3a/brave_p3a_message_manager_unittest.cc

@@ -0,0 +1,12 @@
+diff --git a/crypto/unexportable_key.cc b/crypto/unexportable_key.cc
+index c735638d0e168bb30773d92503e3b8dd5bac7c31..28d6e9c8d221ad863bbc3e1636d3f1721218bdb8 100644
+--- a/crypto/unexportable_key.cc
++++ b/crypto/unexportable_key.cc
+@@ -75,6 +75,7 @@ void MeasureTPMAvailabilityWin() {
+           if (algo) {
+             switch (*algo) {
+               case SignatureVerifier::SignatureAlgorithm::ECDSA_SHA256:
++              case SignatureVerifier::SignatureAlgorithm::ECDSA_SHA384:
+                 result = TPMSupport::kECDSA;
+                 break;
+               case SignatureVerifier::SignatureAlgorithm::RSA_PKCS1_SHA256: