Merge branch 'bip32-ed25519'

Author: benma

.cargo/config.toml

@@ -6,9 +6,9 @@ git = "https://github.com/probe-rs/rtt-target.git"
 rev = "117d9519a5d3b1f4bc024bc05f9e3c5dec0a57f5"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/digitalbitbox/rust-bip32-ed25519?tag=v0.1.2"]
+[source."git+https://github.com/BitBoxSwiss/rust-bip32-ed25519?tag=v0.2.1"]
 git = "https://github.com/BitBoxSwiss/rust-bip32-ed25519"
-tag = "v0.2.0"
+tag = "v0.2.1"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/benma/rust-bip39.git?branch=bb02"]

external/vendor/bip32-ed25519/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".github/workflows/ci.yml":"f465a052857e00c4a513784ae8527fca34a9a0b1075c7511bbf302b96d6e9e36","Cargo.toml":"5723b22b427c57970086646e75e93276fe8d61215dc394419613c81257210950","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"5530596cde343de2238ec3276d94599ff6e78b7b7a20f6143162b3eceb727f29","README.md":"99a18dfc2a588d8b8cb3c287dad52d2e76c2b2b3be0e7a95cce19f509e9d59d7","src/arbitrary.rs":"ecb52788eec1142459ab252c320a5f0e421eb63cf959260b16e689ccfc8f2590","src/bigint.rs":"756b33c8d971b282b43268671c08fb4d8af095a6ebb6e9dc0c750631650e4d14","src/lib.rs":"93a19d865e85bde9646e42ef6c6b5106d6876c71fcffedad4b2c523deeb6f951","tests/table_test.rs":"7cba52f2578cfaf44f7d01a14ae1ce3b2b21857079722b7f04a507ca2884d878","tests/testdata/gen_table.py":"2fd91055920d9ac4cfb6c004b96aca42aaf2e3cf074d0d49d48ada993abdaedf","tests/testdata/table.json":"9e37a43d759f793b091f87488ea4b6d733154a10d29554c5103e12d617ae70cd"},"package":null}
+{"files":{".github/workflows/ci.yml":"d0ff5825b83ec08980dbb04e73e937b936197b228b1bb011bcaafd3e77c28688","Cargo.toml":"adfbd61e5383bc0797d07f7ca8066f036d608eb0a8a8b94b0324de8253d3b23d","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"5530596cde343de2238ec3276d94599ff6e78b7b7a20f6143162b3eceb727f29","README.md":"99a18dfc2a588d8b8cb3c287dad52d2e76c2b2b3be0e7a95cce19f509e9d59d7","rustfmt.toml":"f32d2f03b3f4b1e295c79ed49d543f1205c7dac7c3dc74f05a5a27af4fea0584","src/arbitrary.rs":"ecb52788eec1142459ab252c320a5f0e421eb63cf959260b16e689ccfc8f2590","src/bigint.rs":"756b33c8d971b282b43268671c08fb4d8af095a6ebb6e9dc0c750631650e4d14","src/lib.rs":"5744fd99f11d4a98bf88a5f4e9f73e13eb56cf7b29bacd8ebd98736bd06d88af","tests/table_test.rs":"2507b6b762fa27044a0a3922073ee50e4bcfc2f66b10f8e3ac9d36a12818c51f","tests/testdata/gen_table.py":"2fd91055920d9ac4cfb6c004b96aca42aaf2e3cf074d0d49d48ada993abdaedf","tests/testdata/table.json":"9e37a43d759f793b091f87488ea4b6d733154a10d29554c5103e12d617ae70cd"},"package":null}

external/vendor/bip32-ed25519/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on: [push, pull_request]
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
 
   test:
     name: Test Suite
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

external/vendor/bip32-ed25519/Cargo.toml

@@ -10,9 +10,9 @@
 # See Cargo.toml.orig for the original contents.
 
 [package]
-edition = "2021"
+edition = "2024"
 name = "bip32-ed25519"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Shift Crypto AG <[email protected]>"]
 build = false
 autolib = false

external/vendor/bip32-ed25519/rustfmt.toml

@@ -0,0 +1 @@
+edition = "2024"

external/vendor/bip32-ed25519/src/lib.rs

@@ -15,9 +15,9 @@ use alloc::boxed::Box;
 use core::convert::TryInto;
 
 use core::ops::{Deref, DerefMut};
-use digest::{core_api::BlockSizeUser, typenum::U64, Digest};
+use digest::{Digest, core_api::BlockSizeUser, typenum::U64};
 use hmac::{Mac, SimpleHmac};
-use zeroize::{Zeroize, Zeroizing};
+use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing};
 
 use curve25519_dalek::{
     edwards::{CompressedEdwardsY, EdwardsPoint},
@@ -115,8 +115,7 @@ impl<D: Digest<OutputSize = U64> + BlockSizeUser> Xpub<D> {
     }
 }
 
-#[derive(Zeroize, Clone, Debug, PartialEq)]
-#[zeroize(drop)]
+#[derive(Zeroize, ZeroizeOnDrop, Clone, Debug, PartialEq)]
 struct XprvData {
     // An xprv consists of an expanded Ed25519 secret key and a chain
     // code.
@@ -134,7 +133,7 @@ struct XprvData {
 }
 
 /// The `D` digest type param must implement SHA512. Use `sha2::Sha512` if in doubt.
-#[derive(Clone, Debug)]
+#[derive(Zeroize, ZeroizeOnDrop, Clone, Debug)]
 pub struct Xprv<D: Digest<OutputSize = U64> + BlockSizeUser + Clone>(
     // The data is boxed so that moving an `Xprv` does not accidentally
     // leave copies of the data on the stack.
@@ -371,18 +370,24 @@ mod tests {
 
     #[test]
     fn xpub_hard_derivation_fails() {
-        assert!(Xprv::<Sha512>::from_normalize(KEY, CHAIN_CODE)
-            .public()
-            .derive(HARDENED_OFFSET - 1)
-            .is_ok());
-        assert!(Xprv::<Sha512>::from_normalize(KEY, CHAIN_CODE)
-            .public()
-            .derive(HARDENED_OFFSET)
-            .is_err());
-        assert!(Xprv::<Sha512>::from_normalize(KEY, CHAIN_CODE)
-            .public()
-            .derive(u32::MAX)
-            .is_err());
+        assert!(
+            Xprv::<Sha512>::from_normalize(KEY, CHAIN_CODE)
+                .public()
+                .derive(HARDENED_OFFSET - 1)
+                .is_ok()
+        );
+        assert!(
+            Xprv::<Sha512>::from_normalize(KEY, CHAIN_CODE)
+                .public()
+                .derive(HARDENED_OFFSET)
+                .is_err()
+        );
+        assert!(
+            Xprv::<Sha512>::from_normalize(KEY, CHAIN_CODE)
+                .public()
+                .derive(u32::MAX)
+                .is_err()
+        );
     }
 
     #[test]

external/vendor/bip32-ed25519/tests/table_test.rs

@@ -3,7 +3,7 @@ use std::fs::File;
 use std::io::BufReader;
 
 // Our crate:
-use bip32_ed25519::{Xprv, ED25519_EXPANDED_SECRET_KEY_SIZE};
+use bip32_ed25519::{ED25519_EXPANDED_SECRET_KEY_SIZE, Xprv};
 
 // Another crate for comparison:
 use ed25519_bip32;

src/rust/Cargo.lock

@@ -42,7 +42,7 @@ zeroize = { workspace = true }
 num-bigint = { workspace = true, optional = true }
 num-traits = { version = "0.2", default-features = false }
 # If you change this, also change src/rust/.cargo/config.toml.
-bip32-ed25519 = { git = "https://github.com/BitBoxSwiss/rust-bip32-ed25519", tag = "v0.2.0", optional = true }
+bip32-ed25519 = { git = "https://github.com/BitBoxSwiss/rust-bip32-ed25519", tag = "v0.2.1", optional = true }
 bech32 = { workspace = true, optional = true }
 blake2 = { version = "0.10.6", default-features = false, optional = true }
 minicbor = { version = "0.24.0", default-features = false, features = ["alloc"], optional = true }