Skip to content

Commit b3cf5d7

Browse files
committed
Make wireguard-go a submodule, instead of importing as a git ref
This removes the requirement that the version of `cmaybenot` specified in `wireguard-go-rs/Cargo.toml` and the version of `wireguard-go` specified in `libwg/go.mod` match.
1 parent bbb9c76 commit b3cf5d7

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.gitmodules

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@
66
url = https://github.com/mullvad/libwfp
77
[submodule "windows/windows-libraries"]
88
path = windows/windows-libraries
9-
url = https://github.com/mullvad/windows-libraries
9+
url = https://github.com/mullvad/windows-libraries
10+
[submodule "wireguard-go-rs/libwg/wireguard-go"]
11+
path = wireguard-go-rs/libwg/wireguard-go
12+
url = https://github.com/mullvad/wireguard-go/

Cargo.lock

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wireguard-go-rs/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ edition = "2021"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[target.'cfg(unix)'.dependencies]
10-
# NOTE: remember to update libwg/go.mod if you change this:
11-
cmaybenot = { git = "https://github.com/mullvad/wireguard-go", rev = "44e212db23cf998924ba4193816964a83f9e1e79" }
10+
cmaybenot = { path = "libwg/wireguard-go/cmaybenot" }

wireguard-go-rs/libwg/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
require (
1111
golang.org/x/crypto v0.22.0 // indirect
1212
golang.org/x/net v0.24.0 // indirect
13-
golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
13+
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
1414
)
1515

1616
// NOTE: remember to update wireguard-go-rs/Cargo.toml if you change this:
17-
replace golang.zx2c4.com/wireguard => github.com/mullvad/wireguard-go v0.0.0-20240430143015-44e212db23cf
17+
replace golang.zx2c4.com/wireguard => ./wireguard-go

wireguard-go-rs/libwg/go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
github.com/mullvad/wireguard-go v0.0.0-20240430143015-44e212db23cf h1:XKKo1gi5eGR9TAZns0BxvxnY70+wQwgAHbKC2L3/sEg=
2-
github.com/mullvad/wireguard-go v0.0.0-20240430143015-44e212db23cf/go.mod h1:whfbyDBt09xhCYQWtO2+3UVjlaq6/9hDZrjg2ZE6SyA=
31
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
42
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
53
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
64
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
75
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
86
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
9-
golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 h1:Ug9qvr1myri/zFN6xL17LSCBGFDnphBBhzmILHsM5TY=
10-
golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
7+
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
8+
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=

wireguard-go-rs/libwg/wireguard-go

Submodule wireguard-go added at 1c7e9f0

0 commit comments

Comments
 (0)