From 07b7457c2e91794ef6f3185cfb6fc8577f573016 Mon Sep 17 00:00:00 2001 From: Ruoqing He Date: Tue, 11 Feb 2025 07:40:16 +0800 Subject: [PATCH] build: Bump getrandom from 0.2.15 to 0.3.1 Manually bump `getrandom` due to API changes. Bumps [getrandom](https://github.com/rust-random/getrandom) from 0.2.15 to 0.3.1. - [Changelog](https://github.com/rust-random/getrandom/blob/master/CHANGELOG.md) - [Commits](rust-random/getrandom@v0.2.15...v0.3.1) Signed-off-by: Ruoqing He --- Cargo.lock | 42 ++++++++++++++++++++++++++++++++++++------ net_util/Cargo.toml | 2 +- net_util/src/mac.rs | 2 +- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cb70c7856..f4418d733 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -913,10 +913,22 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", +] + [[package]] name = "gimli" version = "0.31.1" @@ -1273,7 +1285,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -1288,7 +1300,7 @@ name = "net_util" version = "0.1.0" dependencies = [ "epoll", - "getrandom", + "getrandom 0.3.1", "libc", "log", "net_gen", @@ -1724,7 +1736,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -1768,7 +1780,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror 1.0.62", ] @@ -2208,7 +2220,7 @@ version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" dependencies = [ - "getrandom", + "getrandom 0.2.15", "rand", "uuid-macro-internal", ] @@ -2539,6 +2551,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -2772,6 +2793,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "xdg-home" version = "1.3.0" diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index 1dab3d9a2..9333be27e 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -6,7 +6,7 @@ version = "0.1.0" [dependencies] epoll = "4.3.3" -getrandom = "0.2.15" +getrandom = "0.3.1" libc = "0.2.167" log = "0.4.22" net_gen = { path = "../net_gen" } diff --git a/net_util/src/mac.rs b/net_util/src/mac.rs index 35270c289..a1ed6a764 100644 --- a/net_util/src/mac.rs +++ b/net_util/src/mac.rs @@ -80,7 +80,7 @@ impl MacAddr { pub fn local_random() -> MacAddr { // Generate a fully random MAC let mut random_bytes = [0u8; MAC_ADDR_LEN]; - if let Err(e) = getrandom::getrandom(&mut random_bytes) { + if let Err(e) = getrandom::fill(&mut random_bytes) { error!( "Error populating MAC address with random data: {}", e.to_string()