From 183c2cc7abf8d3cac0ff043ce9dc91ae98cee5fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 07:58:11 -0700
Subject: [PATCH] build(deps): Bump wintun from 0.2.1 to 0.3.1 in /rust (#2129)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [wintun](https://github.com/nulldotblack/wintun) from 0.2.1 to
0.3.1.
Release notes
Sourced from wintun's
releases.
v0.3.1
Added
- Support for non 32bit x86 and arm targets in all three examples
Updated
v0.3.0
Added
- udp-echo example which mirrors packets via the tun interface
Adapter::get_name, Adapter::set_name, and
Adapter::get_guidAdapter::set_address Adapter::set_gateway,
Adapter::set_netmask, or
Adapter::set_network_addresses_tuple to set all three at
once
- Easily configure adapter address, netmask, and gateway properties to
more easily control how it interacts with the Windows networking
stack
- And
Adapter::get_addresses,
Adapter::get_gateways,
Adapter::get_netmask_of_address to read this state
Breaking Changes
- Renamed
enum ApiError -> enum Error and
added more variants.
- All functions returning
wintun::Result are
effected.
- Removed
pool: &str parameter from
Adapter::create as this was removed from the wintun c
library
- Changed return type of
Session::get_read_wait_event
from Result<winnt::HANDLE, ()> to
Result<windows::Win32::HANDLE, wintun::Error>
Plus internal refactoring and cleanup by @ssrlive in #7.
Thanks!
Changelog
Sourced from wintun's
changelog.
[0.3.1] - 2023-09-16
Added
- Support for non 32bit x86 and arm targets in all three examples
Updated
[0.3.0] - 2023-09-15
Added
- udp-echo example which mirrors packets via the tun interface
Adapter::get_name, Adapter::set_name, and
Adapter::get_guidAdapter::set_address Adapter::set_gateway,
Adapter::set_netmask, or
Adapter::set_network_addresses_tuple to set all three at
once
- Easily configure adapter address, netmask, and gateway properties to
more easily control how it interacts with the Windows networking
stack
- And
Adapter::get_addresses,
Adapter::get_gateways,
Adapter::get_netmask_of_address to read this state
Breaking Changes
- Renamed
enum ApiError -> enum Error and
added more variants.
- All functions returning
wintun::Result are
effected.
- Removed
pool: &str parameter from
Adapter::create as this was removed from the wintun c
library
- Changed return type of
Session::get_read_wait_event
from Result<winnt::HANDLE, ()> to
Result<windows::Win32::HANDLE, wintun::Error>
Plus internal refactoring and cleanup by @ssrlive: nulldotblack/wintun#7.
Thanks!
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore ` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore ` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore ` will
remove the ignore condition of the specified dependency and ignore
conditions
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
rust/Cargo.lock | 54 ++++++++++++++++++++---------
rust/connlib/libs/tunnel/Cargo.toml | 2 +-
2 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index f77a4f492..97e508a21 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -700,7 +700,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
dependencies = [
"glob",
"libc",
- "libloading",
+ "libloading 0.7.4",
]
[[package]]
@@ -1663,7 +1663,7 @@ dependencies = [
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "windows",
+ "windows 0.48.0",
]
[[package]]
@@ -1842,7 +1842,7 @@ dependencies = [
"combine",
"java-locator",
"jni-sys",
- "libloading",
+ "libloading 0.7.4",
"log",
"thiserror",
"walkdir",
@@ -1892,6 +1892,16 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "libloading"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "libm"
version = "0.2.7"
@@ -4391,12 +4401,6 @@ dependencies = [
"rustix",
]
-[[package]]
-name = "widestring"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
-
[[package]]
name = "winapi"
version = "0.3.9"
@@ -4437,6 +4441,25 @@ dependencies = [
"windows-targets 0.48.5",
]
+[[package]]
+name = "windows"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
[[package]]
name = "windows-sys"
version = "0.45.0"
@@ -4571,17 +4594,14 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "wintun"
-version = "0.2.1"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "094235c21dfb805c6870b00d0d80f65b727d8296ab88ae6b506e827e4b4116de"
+checksum = "3d16b65b0688b87ea78a15274db89200a13638b136cd4a70885da61a65203ef6"
dependencies = [
- "itertools 0.10.5",
- "libloading",
+ "libloading 0.8.0",
"log",
- "once_cell",
- "rand",
- "widestring",
- "winapi",
+ "thiserror",
+ "windows 0.51.1",
]
[[package]]
diff --git a/rust/connlib/libs/tunnel/Cargo.toml b/rust/connlib/libs/tunnel/Cargo.toml
index cc9336e84..41a25caa3 100644
--- a/rust/connlib/libs/tunnel/Cargo.toml
+++ b/rust/connlib/libs/tunnel/Cargo.toml
@@ -42,4 +42,4 @@ tracing-android = "0.2"
# Windows tunnel dependencies
[target.'cfg(target_os = "windows")'.dependencies]
-wintun = "0.2.1"
+wintun = "0.3.1"