Merge remote-tracking branch 'benma/rust-1.69'

Author: benma

.ci/run-container-ci

@@ -25,7 +25,7 @@
 set -e
 set -x
 
-CONTAINER=shiftcrypto/firmware_v2:32
+CONTAINER=shiftcrypto/firmware_v2:33
 
 if [ "$1" == "pull" ] ; then
 	docker pull "$CONTAINER"

Dockerfile

@@ -130,7 +130,7 @@ RUN rustup target add thumbv7em-none-eabi
 RUN rustup component add rustfmt
 RUN rustup component add clippy
 RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.24.3
-RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.64.0
+RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.65.1
 
 COPY tools/prost-build-proto prost-build-proto
 RUN CARGO_HOME=/opt/cargo cargo install --path prost-build-proto --locked

src/rust/bitbox02/src/util.rs

@@ -18,8 +18,10 @@ use alloc::vec::Vec;
 /// Parses a utf-8 string out of a null terminated buffer. Returns `Err(())` if there
 /// is no null terminator or if the bytes before the null terminator is invalid UTF8.
 pub fn str_from_null_terminated(input: &[u8]) -> Result<&str, ()> {
-    let len = input.iter().position(|&c| c == 0).ok_or(())?;
-    core::str::from_utf8(&input[0..len]).or(Err(()))
+    core::ffi::CStr::from_bytes_until_nul(input)
+        .or(Err(()))?
+        .to_str()
+        .or(Err(()))
 }
 
 /// Parses a utf-8 string out of a null terminated buffer starting at `ptr`. Returns `Err(())` if

src/rust/rust-toolchain

@@ -1 +1 @@
-1.68.0
+1.69.0