[rust] update semver-compatible dependencies

* indexmap has an API deprecation, so the usage is replaced. * serialport now sets DTR on open by default, disable this behaviour to stay compatible. Signed-off-by: Gary Guo <[email protected]>
lowRISC · Jan 16, 2025 · 140185f · 140185f
1 parent 11ac7bd
commit 140185f
Show file tree

Hide file tree

Showing 6 changed files with 340 additions and 382 deletions.
diff --git a/sw/host/opentitanlib/src/transport/common/uart.rs b/sw/host/opentitanlib/src/transport/common/uart.rs
@@ -35,7 +35,7 @@ impl SerialPortUart {
 
     /// Open the given serial device, such as `/dev/ttyUSB0`.
     pub fn open(port_name: &str, baud: u32) -> Result<Self> {
-        let port = TTYPort::open(&serialport::new(port_name, baud))
+        let port = TTYPort::open(&serialport::new(port_name, baud).preserve_dtr_on_open())
             .map_err(|e| UartError::OpenError(e.to_string()))?;
         flock_serial(&port, port_name)?;
         Ok(SerialPortUart {
@@ -49,7 +49,7 @@ impl SerialPortUart {
 
     /// Open a pseudo port (e.g. a verilator pts device).
     pub fn open_pseudo(port_name: &str, baud: u32) -> Result<Self> {
-        let port = TTYPort::open(&serialport::new(port_name, baud))
+        let port = TTYPort::open(&serialport::new(port_name, baud).preserve_dtr_on_open())
             .map_err(|e| UartError::OpenError(e.to_string()))?;
         flock_serial(&port, port_name)?;
         Ok(SerialPortUart {

diff --git a/sw/host/opentitanlib/src/transport/hyperdebug/mod.rs b/sw/host/opentitanlib/src/transport/hyperdebug/mod.rs
@@ -466,9 +466,12 @@ impl Inner {
             .console_tty
             .to_str()
             .ok_or(TransportError::UnicodePathError)?;
-        let port =
-            TTYPort::open(&serialport::new(port_name, 115_200).timeout(Self::COMMAND_TIMEOUT))
-                .context("Failed to open HyperDebug console")?;
+        let port = TTYPort::open(
+            &serialport::new(port_name, 115_200)
+                .preserve_dtr_on_open()
+                .timeout(Self::COMMAND_TIMEOUT),
+        )
+        .context("Failed to open HyperDebug console")?;
         flock_serial(&port, port_name)?;
         let conn = Rc::new(Conn {
             console_port: RefCell::new(port),

diff --git a/sw/host/ot_certs/src/template/subst.rs b/sw/host/ot_certs/src/template/subst.rs
@@ -188,7 +188,7 @@ impl Subst for Template {
         let mut variables = self.variables.clone();
         let mut new_data = SubstData::new();
         for (var_name, val) in data.values.iter() {
-            let Some(var_type) = variables.remove(var_name) else {
+            let Some(var_type) = variables.shift_remove(var_name) else {
                 // Variable does not appear in the template: ignore it.
                 continue;
             };

diff --git a/third_party/rust/.cargo/audit.toml b/third_party/rust/.cargo/audit.toml
@@ -1,4 +1,4 @@
 [advisories]
 ignore = [
-    "RUSTSEC-2020-0168", # `mach`, dependency of `serialport`, only affects MacOS
+    "RUSTSEC-2023-0071", # `rsa`, decryption is vulnerable to timing attack. We only sign/verify.
 ]