Merge branch 'update-deps2'

Author: benma

src/rust/Cargo.lock

@@ -24,16 +24,16 @@ license = "Apache-2.0"
 zeroize = "1.6.0"
 
 [dependencies.noise-protocol]
-version = "0.1.3"
+version = "0.2.0"
 default-features = false
 features = ["use_alloc"]
 
 [dependencies.noise-rust-crypto]
-version = "0.4.1"
+version = "0.6.2"
 default-features = false
 features = ["use-sha2", "use-chacha20poly1305"]
 
 [dependencies.x25519-dalek]
-version = "1.1.0"
+version = "2.0.0"
 default-features = false
-features = ["u32_backend"]
+features = ["static_secrets"]

src/rust/bitbox02-noise/Cargo.toml

@@ -28,8 +28,8 @@ bitbox02 = { path = "../bitbox02", optional = true }
 bitbox02-noise = { path = "../bitbox02-noise", optional = true }
 util = { path = "../util" }
 hex = { version = "0.4", default-features = false }
-sha2 = { version = "0.9.2", default-features = false, optional = true }
-sha3 = { version = "0.9.1", default-features = false, optional = true }
+sha2 = { version = "0.10.8", default-features = false, optional = true }
+sha3 = { version = "0.10.8", default-features = false, optional = true }
 bitcoin = { version = "0.30.0", default-features = false, features = ["no-std"], optional = true }
 
 [features]

src/rust/bitbox02-rust-c/Cargo.toml

@@ -31,21 +31,21 @@ util = {path = "../util"}
 binascii = { version = "0.1.4", default-features = false, features = ["encode"] }
 bitbox02-noise = {path = "../bitbox02-noise"}
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
-sha2 = { version = "0.9.2", default-features = false }
-sha3 = { version = "0.9.1", default-features = false, optional = true }
+sha2 = { version = "0.10.8", default-features = false }
+sha3 = { version = "0.10.8", default-features = false, optional = true }
 digest = "0.10.6"
 zeroize = "1.6.0"
 num-bigint = { version = "0.4.3", default-features = false, optional = true }
 num-traits = { version = "0.2", default-features = false, optional = true }
-bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", tag = "v0.1.0", optional = true }
+bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", tag = "v0.1.2", optional = true }
 bech32 = { version = "0.9", default-features = false, optional = true }
 blake2 = { version = "0.10.6", default-features = false, optional = true }
 minicbor = { version = "0.19.1", default-features = false, features = ["alloc"], optional = true }
 crc = { version = "3.0.1", optional = true }
-ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u32_backend"], optional = true }
+ed25519-dalek = { version = "2.0.0", default-features = false, features = ["hazmat"], optional = true }
 lazy_static = { version = "1.4.0", optional = true }
 async-recursion = "1.0.4"
-hmac = "0.11.0"
+hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 
 miniscript = { version = "10.0.0", default-features = false, features = ["no-std"], optional = true }
 bitcoin = { version = "0.30.0", default-features = false, features = ["no-std"], optional = true }

src/rust/bitbox02-rust/Cargo.toml

@@ -35,7 +35,7 @@ pub fn perform(host_challenge: [u8; 32]) -> Result<Data, ()> {
         &mut result.certificate,
         &mut result.root_pubkey_identifier,
     )?;
-    let hash: [u8; 32] = Sha256::digest(&host_challenge).into();
+    let hash: [u8; 32] = Sha256::digest(host_challenge).into();
     bitbox02::memory::bootloader_hash(&mut result.bootloader_hash);
     bitbox02::securechip::attestation_sign(&hash, &mut result.challenge_signature)?;
     Ok(result)

src/rust/bitbox02-rust/src/attestation.rs

@@ -20,7 +20,7 @@ use alloc::boxed::Box;
 use alloc::string::String;
 use alloc::vec::Vec;
 
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use sha2::{Digest, Sha256};
 use zeroize::{Zeroize, Zeroizing};
 

src/rust/bitbox02-rust/src/backup.rs

@@ -60,7 +60,7 @@ pub fn sighash(args: &Args) -> [u8; 32] {
     ctx.update(args.locktime.to_le_bytes());
     // 10.
     ctx.update(args.sighash_flags.to_le_bytes());
-    Sha256::digest(&ctx.finalize()).into()
+    Sha256::digest(ctx.finalize()).into()
 }
 
 #[cfg(test)]

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

@@ -130,7 +130,7 @@ impl Payload {
             pb::btc_script_config::multisig::ScriptType::try_from(multisig.script_type)?;
         let script = multisig::pkscript(multisig, keypath_change, keypath_address)?;
         let payload_p2wsh = Payload {
-            data: Sha256::digest(&script).to_vec(),
+            data: Sha256::digest(script).to_vec(),
             output_type: BtcOutputType::P2wsh,
         };
         match script_type {
@@ -160,7 +160,7 @@ impl Payload {
         let witness_script = policy.witness_script_at_keypath(keypath)?;
         match policy {
             super::policies::ParsedPolicy::Wsh { .. } => Ok(Payload {
-                data: Sha256::digest(&witness_script).to_vec(),
+                data: Sha256::digest(witness_script).to_vec(),
                 output_type: BtcOutputType::P2wsh,
             }),
         }

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

@@ -90,7 +90,7 @@ pub async fn process(request: &pb::BtcSignMessageRequest) -> Result<Response, Er
     msg.extend(super::script::serialize_varint(request.msg.len() as _));
     msg.extend(&request.msg);
 
-    let sighash: [u8; 32] = Sha256::digest(&Sha256::digest(&msg))
+    let sighash: [u8; 32] = Sha256::digest(Sha256::digest(msg))
         .as_slice()
         .try_into()
         .unwrap();

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

@@ -369,7 +369,7 @@ async fn handle_prevtx(
 
     hasher.update(prevtx_init.locktime.to_le_bytes());
     // Hash again to produce the final double-hash.
-    let hash = Sha256::digest(&hasher.finalize());
+    let hash = Sha256::digest(hasher.finalize());
     if hash.as_slice() != input.prev_out_hash.as_slice() {
         return Err(Error::InvalidInput);
     }
@@ -910,8 +910,8 @@ async fn _process(request: &pb::BtcSignInitRequest) -> Result<Response, Error> {
             const SIGHASH_ALL: u32 = 0x01;
             let sighash = bip143::sighash(&bip143::Args {
                 version: request.version,
-                hash_prevouts: Sha256::digest(&hash_prevouts).try_into().unwrap(),
-                hash_sequence: Sha256::digest(&hash_sequence).try_into().unwrap(),
+                hash_prevouts: Sha256::digest(hash_prevouts).try_into().unwrap(),
+                hash_sequence: Sha256::digest(hash_sequence).try_into().unwrap(),
                 outpoint_hash: tx_input.prev_out_hash.as_slice().try_into().unwrap(),
                 outpoint_index: tx_input.prev_out_index,
                 sighash_script: &sighash_script(
@@ -921,7 +921,7 @@ async fn _process(request: &pb::BtcSignInitRequest) -> Result<Response, Error> {
                 )?,
                 prevout_value: tx_input.prev_out_value,
                 sequence: tx_input.sequence,
-                hash_outputs: Sha256::digest(&hash_outputs).try_into().unwrap(),
+                hash_outputs: Sha256::digest(hash_outputs).try_into().unwrap(),
                 locktime: request.locktime,
                 sighash_flags: SIGHASH_ALL,
             });