diff --git a/.changelog/unreleased/improvements/4818-up-hderive.md b/.changelog/unreleased/improvements/4818-up-hderive.md new file mode 100644 index 00000000000..8595647ddcf --- /dev/null +++ b/.changelog/unreleased/improvements/4818-up-hderive.md @@ -0,0 +1,2 @@ +- Updated tiny-hderive crate to replace unmaintained memzero crate with zeroize. + ([\#4818](https://github.com/namada-net/namada/pull/4818)) \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index de6c31f0c5f..04dff11e19d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5230,12 +5230,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d97bbf43eb4f088f8ca469930cde17fa036207c9a5e02ccc5107c4e8b17c964" -[[package]] -name = "memzero" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c0d11ac30a033511ae414355d80f70d9f29a44a49140face477117a1ee90db" - [[package]] name = "mime" version = "0.3.17" @@ -5480,15 +5474,15 @@ dependencies = [ [[package]] name = "nam-tiny-hderive" -version = "0.3.1-nam.0" +version = "0.3.1-nam.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfd77f274636f722e966c394b381a70233ed4c25150864a4c53d398028a6818" +checksum = "b2cd44792ed5cd84dc9dedc3d572242ac00e76c244e85eb4bf34da2c6239ce30" dependencies = [ "base58", "hmac", "k256", - "memzero", "sha2 0.10.8", + "zeroize", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f21243361b1..a76b8f1c66a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -245,7 +245,7 @@ tendermint-rpc = {version = "0.40.3", default-features = false} test-log = {version = "0.2", default-features = false, features = ["trace"]} textwrap-macros = "0.3" tiny-bip39 = {version = "2.0"} -tiny-hderive = {package = "nam-tiny-hderive", version = "0.3.1-nam.0"} +tiny-hderive = {package = "nam-tiny-hderive", version = "0.3.1-nam.1"} tiny-keccak = { version = "2.0", features = ["keccak"] } thiserror = "2.0" tokio = {version = "1.8", default-features = false} diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 66b217f6b98..8a741e6671b 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -3,6 +3,7 @@ name = "namada_fuzz" version = "0.251.0" publish = false edition = "2024" +license = "GPL-3.0-or-later" [package.metadata] cargo-fuzz = true diff --git a/scripts/make-package.sh b/scripts/make-package.sh index 55465071008..b8514304507 100755 --- a/scripts/make-package.sh +++ b/scripts/make-package.sh @@ -16,6 +16,6 @@ ln ${BIN} ../../${PACKAGE_NAME} && \ cd ../.. && \ ln wasm/*.*.wasm wasm/checksums.json ${PACKAGE_NAME}/wasm && \ ln LICENSE ${PACKAGE_NAME} && \ -cargo about generate about.hbs --output-file ${PACKAGE_NAME}/LICENSE.thirdparty && \ +cargo about generate about.hbs --fail --output-file ${PACKAGE_NAME}/LICENSE.thirdparty && \ tar -c -z -f ${PACKAGE_NAME}.tar.gz ${PACKAGE_NAME} && \ rm -rf ${PACKAGE_NAME} diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index 5157e27581a..88387f24288 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -2527,6 +2527,19 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "git2" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" +dependencies = [ + "bitflags 2.8.0", + "libc", + "libgit2-sys", + "log", + "url", +] + [[package]] name = "glob" version = "0.3.2" @@ -4022,6 +4035,18 @@ version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +[[package]] +name = "libgit2-sys" +version = "0.18.2+1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + [[package]] name = "libm" version = "0.2.11" @@ -4038,6 +4063,18 @@ dependencies = [ "libc", ] +[[package]] +name = "libz-sys" +version = "1.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -4214,12 +4251,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d97bbf43eb4f088f8ca469930cde17fa036207c9a5e02ccc5107c4e8b17c964" -[[package]] -name = "memzero" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c0d11ac30a033511ae414355d80f70d9f29a44a49140face477117a1ee90db" - [[package]] name = "mime" version = "0.3.17" @@ -4372,15 +4403,15 @@ dependencies = [ [[package]] name = "nam-tiny-hderive" -version = "0.3.1-nam.0" +version = "0.3.1-nam.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfd77f274636f722e966c394b381a70233ed4c25150864a4c53d398028a6818" +checksum = "b2cd44792ed5cd84dc9dedc3d572242ac00e76c244e85eb4bf34da2c6239ce30" dependencies = [ "base58", "hmac", "k256", - "memzero", "sha2 0.10.8", + "zeroize", ] [[package]] @@ -4965,6 +4996,7 @@ version = "0.251.0" dependencies = [ "borsh", "clru", + "git2", "nam-wasm-instrument", "namada_account", "namada_core",