rust: update rust toolchain to 1.66.0 and cbindgen to 0.63.0

cbindgen made a breaking change renaming whitelist to allowlist.

The rest is new Clippy warnings.

Clippy needless_borrow is disabled because the new cases it reported
seemed to cause a move/copy. I am not sure if the compiler would have
created the same output in either case. Might revisit this and
re-enable this linter in the future.

Author: benma

.ci/run-container-ci

@@ -25,7 +25,7 @@
 set -e
 set -x
 
-CONTAINER=shiftcrypto/firmware_v2:29
+CONTAINER=shiftcrypto/firmware_v2:30
 
 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.61.0
+RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.63.0
 
 COPY tools/prost-build prost-build
 RUN CARGO_HOME=/opt/cargo cargo install --path prost-build --locked

src/CMakeLists.txt

@@ -271,127 +271,127 @@ add_custom_target(rust-bindgen
     --use-core
     --with-derive-default
     --ctypes-prefix util::c_types
-    --whitelist-function strftime
-    --whitelist-function localtime
-    --whitelist-function wally_free_string
-    --whitelist-function mock_memory_factoryreset
-    --whitelist-function memory_setup
-    --whitelist-function memory_is_initialized
-    --whitelist-function memory_set_initialized
-    --whitelist-function memory_is_seeded
-    --whitelist-function memory_is_mnemonic_passphrase_enabled
-    --whitelist-function memory_get_attestation_pubkey_and_certificate
-    --whitelist-function memory_bootloader_hash
-    --whitelist-function memory_get_noise_static_private_key
-    --whitelist-function memory_check_noise_remote_static_pubkey
-    --whitelist-function memory_add_noise_remote_static_pubkey
-    --whitelist-function memory_get_device_name
-    --whitelist-function memory_set_device_name
-    --whitelist-function memory_set_mnemonic_passphrase_enabled
-    --whitelist-var MEMORY_MULTISIG_NAME_MAX_LEN
-    --whitelist-function memory_set_seed_birthdate
-    --whitelist-function memory_get_seed_birthdate
-    --whitelist-function memory_multisig_get_by_hash
-    --whitelist-function memory_multisig_set_by_hash
-    --whitelist-function smarteeprom_bb02_config
-    --whitelist-function bitbox02_smarteeprom_init
+    --allowlist-function strftime
+    --allowlist-function localtime
+    --allowlist-function wally_free_string
+    --allowlist-function mock_memory_factoryreset
+    --allowlist-function memory_setup
+    --allowlist-function memory_is_initialized
+    --allowlist-function memory_set_initialized
+    --allowlist-function memory_is_seeded
+    --allowlist-function memory_is_mnemonic_passphrase_enabled
+    --allowlist-function memory_get_attestation_pubkey_and_certificate
+    --allowlist-function memory_bootloader_hash
+    --allowlist-function memory_get_noise_static_private_key
+    --allowlist-function memory_check_noise_remote_static_pubkey
+    --allowlist-function memory_add_noise_remote_static_pubkey
+    --allowlist-function memory_get_device_name
+    --allowlist-function memory_set_device_name
+    --allowlist-function memory_set_mnemonic_passphrase_enabled
+    --allowlist-var MEMORY_MULTISIG_NAME_MAX_LEN
+    --allowlist-function memory_set_seed_birthdate
+    --allowlist-function memory_get_seed_birthdate
+    --allowlist-function memory_multisig_get_by_hash
+    --allowlist-function memory_multisig_set_by_hash
+    --allowlist-function smarteeprom_bb02_config
+    --allowlist-function bitbox02_smarteeprom_init
     --rustified-enum memory_result_t
-    --whitelist-var MEMORY_DEVICE_NAME_MAX_LEN
-    --whitelist-function securechip_attestation_sign
-    --whitelist-function securechip_monotonic_increments_remaining
-    --whitelist-function securechip_u2f_counter_set
-    --whitelist-function securechip_model
+    --allowlist-var MEMORY_DEVICE_NAME_MAX_LEN
+    --allowlist-function securechip_attestation_sign
+    --allowlist-function securechip_monotonic_increments_remaining
+    --allowlist-function securechip_u2f_counter_set
+    --allowlist-function securechip_model
     --rustified-enum securechip_model_t
-    --whitelist-var KEYSTORE_MAX_SEED_LENGTH
-    --whitelist-function keystore_is_locked
-    --whitelist-function keystore_unlock
-    --whitelist-function keystore_unlock_bip39
-    --whitelist-function keystore_lock
-    --whitelist-function keystore_create_and_store_seed
-    --whitelist-function keystore_copy_seed
-    --whitelist-function keystore_get_bip39_mnemonic
-    --whitelist-function keystore_get_bip39_word
-    --whitelist-function keystore_get_ed25519_seed
-    --whitelist-function keystore_secp256k1_pubkey_uncompressed
-    --whitelist-function keystore_secp256k1_nonce_commit
-    --whitelist-function keystore_secp256k1_sign
-    --whitelist-function keystore_secp256k1_schnorr_bip86_sign
-    --whitelist-function keystore_bip39_mnemonic_to_seed
-    --whitelist-function keystore_get_root_fingerprint
-    --whitelist-function keystore_mock_unlocked
-    --whitelist-function keystore_secp256k1_pubkey_hash160
-    --whitelist-var EC_PUBLIC_KEY_UNCOMPRESSED_LEN
-    --whitelist-var EC_PUBLIC_KEY_LEN
-    --whitelist-function keystore_encode_xpub_at_keypath
-    --whitelist-function keystore_encrypt_and_store_seed
+    --allowlist-var KEYSTORE_MAX_SEED_LENGTH
+    --allowlist-function keystore_is_locked
+    --allowlist-function keystore_unlock
+    --allowlist-function keystore_unlock_bip39
+    --allowlist-function keystore_lock
+    --allowlist-function keystore_create_and_store_seed
+    --allowlist-function keystore_copy_seed
+    --allowlist-function keystore_get_bip39_mnemonic
+    --allowlist-function keystore_get_bip39_word
+    --allowlist-function keystore_get_ed25519_seed
+    --allowlist-function keystore_secp256k1_pubkey_uncompressed
+    --allowlist-function keystore_secp256k1_nonce_commit
+    --allowlist-function keystore_secp256k1_sign
+    --allowlist-function keystore_secp256k1_schnorr_bip86_sign
+    --allowlist-function keystore_bip39_mnemonic_to_seed
+    --allowlist-function keystore_get_root_fingerprint
+    --allowlist-function keystore_mock_unlocked
+    --allowlist-function keystore_secp256k1_pubkey_hash160
+    --allowlist-var EC_PUBLIC_KEY_UNCOMPRESSED_LEN
+    --allowlist-var EC_PUBLIC_KEY_LEN
+    --allowlist-function keystore_encode_xpub_at_keypath
+    --allowlist-function keystore_encrypt_and_store_seed
     --rustified-enum xpub_type_t
-    --whitelist-var XPUB_ENCODED_LEN
-    --whitelist-function lock_animation_start
-    --whitelist-function lock_animation_stop
-    --whitelist-function delay_us
+    --allowlist-var XPUB_ENCODED_LEN
+    --allowlist-function lock_animation_start
+    --allowlist-function lock_animation_stop
+    --allowlist-function delay_us
     --rustified-enum keystore_error_t
     --rustified-enum keystore_secp256k1_pubkey_format
-    --whitelist-function keystore_secp256k1_schnorr_bip86_pubkey
-    --whitelist-function util_format_datetime
-    --whitelist-type buffer_t
-    --whitelist-function delay_ms
-    --whitelist-function UG_PutString
-    --whitelist-function UG_FontSelect
-    --whitelist-function UG_ClearBuffer
-    --whitelist-function UG_SendBuffer
-    --whitelist-function screen_print_debug
-    --whitelist-function ui_screen_stack_push
-    --whitelist-function ui_screen_stack_pop
-    --whitelist-function ui_screen_stack_pop_all
-    --whitelist-function screen_process
-    --whitelist-function label_create
-    --whitelist-function confirm_create
-    --whitelist-function status_create
-    --whitelist-function sdcard_create
-    --whitelist-function menu_create
-    --whitelist-function trinary_choice_create
+    --allowlist-function keystore_secp256k1_schnorr_bip86_pubkey
+    --allowlist-function util_format_datetime
+    --allowlist-type buffer_t
+    --allowlist-function delay_ms
+    --allowlist-function UG_PutString
+    --allowlist-function UG_FontSelect
+    --allowlist-function UG_ClearBuffer
+    --allowlist-function UG_SendBuffer
+    --allowlist-function screen_print_debug
+    --allowlist-function ui_screen_stack_push
+    --allowlist-function ui_screen_stack_pop
+    --allowlist-function ui_screen_stack_pop_all
+    --allowlist-function screen_process
+    --allowlist-function label_create
+    --allowlist-function confirm_create
+    --allowlist-function status_create
+    --allowlist-function sdcard_create
+    --allowlist-function menu_create
+    --allowlist-function trinary_choice_create
     --rustified-enum trinary_choice_t
-    --whitelist-var BASE58_CHECKSUM_LEN
-    --whitelist-function random_32_bytes_mcu
-    --whitelist-function random_mock_reset
-    --whitelist-type component_t
-    --whitelist-type confirm_params_t
-    --whitelist-var MAX_LABEL_SIZE
-    --whitelist-var font_font_a_9X9
-    --whitelist-var font_font_a_11X10
-    --whitelist-var font_monogram_5X9
-    --whitelist-var font_password_11X12
-    --whitelist-type trinary_input_string_params_t
-    --whitelist-var INPUT_STRING_MAX_SIZE
-    --whitelist-function trinary_input_string_create
-    --whitelist-function trinary_input_string_set_input
-    --whitelist-function confirm_transaction_address_create
-    --whitelist-function confirm_transaction_fee_create
-    --whitelist-function progress_create
-    --whitelist-function progress_set
-    --whitelist-function empty_create
-    --whitelist-function reset_reset
-    --whitelist-function sd_card_inserted
-    --whitelist-function sd_format
-    --whitelist-function sd_list_subdir
-    --whitelist-function sd_erase_file_in_subdir
-    --whitelist-function sd_load_bin
-    --whitelist-function sd_write_bin
-    --whitelist-var SD_MAX_FILE_SIZE
-    --whitelist-function sd_free_list
-    --whitelist-var BIP39_WORDLIST_LEN
-    --whitelist-function app_eth_erc20_params_get
+    --allowlist-var BASE58_CHECKSUM_LEN
+    --allowlist-function random_32_bytes_mcu
+    --allowlist-function random_mock_reset
+    --allowlist-type component_t
+    --allowlist-type confirm_params_t
+    --allowlist-var MAX_LABEL_SIZE
+    --allowlist-var font_font_a_9X9
+    --allowlist-var font_font_a_11X10
+    --allowlist-var font_monogram_5X9
+    --allowlist-var font_password_11X12
+    --allowlist-type trinary_input_string_params_t
+    --allowlist-var INPUT_STRING_MAX_SIZE
+    --allowlist-function trinary_input_string_create
+    --allowlist-function trinary_input_string_set_input
+    --allowlist-function confirm_transaction_address_create
+    --allowlist-function confirm_transaction_fee_create
+    --allowlist-function progress_create
+    --allowlist-function progress_set
+    --allowlist-function empty_create
+    --allowlist-function reset_reset
+    --allowlist-function sd_card_inserted
+    --allowlist-function sd_format
+    --allowlist-function sd_list_subdir
+    --allowlist-function sd_erase_file_in_subdir
+    --allowlist-function sd_load_bin
+    --allowlist-function sd_write_bin
+    --allowlist-var SD_MAX_FILE_SIZE
+    --allowlist-function sd_free_list
+    --allowlist-var BIP39_WORDLIST_LEN
+    --allowlist-function app_eth_erc20_params_get
     --rustified-enum simple_type_t
     --rustified-enum multisig_script_type_t
     --rustified-enum output_type_t
-    --whitelist-function btc_common_pkscript_from_payload
-    --whitelist-function btc_common_pkscript_from_multisig
-    --whitelist-var MAX_VARINT_SIZE
-    --whitelist-var MAX_PK_SCRIPT_SIZE
-    --whitelist-function reboot
-    --whitelist-function secp256k1_ecdsa_anti_exfil_host_commit
-    --whitelist-function wally_get_secp_context
-    --whitelist-function wally_hash160
+    --allowlist-function btc_common_pkscript_from_payload
+    --allowlist-function btc_common_pkscript_from_multisig
+    --allowlist-var MAX_VARINT_SIZE
+    --allowlist-var MAX_PK_SCRIPT_SIZE
+    --allowlist-function reboot
+    --allowlist-function secp256k1_ecdsa_anti_exfil_host_commit
+    --allowlist-function wally_get_secp_context
+    --allowlist-function wally_hash160
     ${CMAKE_CURRENT_SOURCE_DIR}/rust/bitbox02-sys/wrapper.h --
     -DPB_NO_PACKED_STRUCTS=1 -DPB_FIELD_16BIT=1 -fshort-enums ${RUST_BINDGEN_FLAGS} ${RUST_INCLUDES}
   COMMAND
@@ -455,6 +455,7 @@ if(NOT CMAKE_CROSSCOMPILING)
             -A clippy::enum_variant_names
             -A clippy::derive_partial_eq_without_eq
             -A clippy::forget_non_drop
+            -A clippy::needless_borrow
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rust/
     )
   add_dependencies(rust-clippy rust-bindgen generate-protobufs)

src/rust/bitbox02-rust-c/src/async_usb.rs

@@ -36,7 +36,7 @@ pub enum UsbResponse {
 #[no_mangle]
 pub unsafe extern "C" fn rust_async_usb_copy_response(out: *mut bitbox02::buffer_t) -> UsbResponse {
     use bitbox02_rust::async_usb::{copy_response, CopyResponseErr};
-    let dst = core::slice::from_raw_parts_mut((*out).data, (*out).max_len as usize);
+    let dst = core::slice::from_raw_parts_mut((*out).data, (*out).max_len);
     match copy_response(dst) {
         Ok(len) => {
             (*out).len = len as _;

src/rust/bitbox02-rust/src/hww/api/bitcoin/script.rs

@@ -39,7 +39,7 @@ pub fn serialize_varint(value: u64) -> Vec<u8> {
         }
         _ => {
             out.push(0xFF);
-            out.extend_from_slice(&(value as u64).to_le_bytes());
+            out.extend_from_slice(&value.to_le_bytes());
         }
     }
     out

src/rust/bitbox02/src/app_btc.rs

@@ -33,7 +33,7 @@ pub fn pkscript_from_multisig(
             &mut out_len,
         )
     } {
-        true => Ok(out[..out_len as usize].to_vec()),
+        true => Ok(out[..out_len].to_vec()),
         false => Err(()),
     }
 }

src/rust/bitbox02/src/sd.rs

@@ -86,9 +86,7 @@ pub fn load_bin(filename: &str, dir: &str) -> Result<zeroize::Zeroizing<Vec<u8>>
             &mut contents_len,
         )
     } {
-        true => Ok(zeroize::Zeroizing::new(
-            contents[..contents_len as usize].to_vec(),
-        )),
+        true => Ok(zeroize::Zeroizing::new(contents[..contents_len].to_vec())),
         false => Err(()),
     }
 }

src/rust/rust-toolchain

@@ -1 +1 @@
-1.65.0
+1.66.0