aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-02-01 00:48:25 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2020-02-01 00:53:30 +0100
commit1ad6b17c35d98677459b32fdbeba1129b80c5995 (patch)
tree540e9fb1bef472ea64200a5b485d40a86f4379e1
parentman: document dynamic debug trick for Linux (diff)
downloadwireguard-tools-1ad6b17c35d98677459b32fdbeba1129b80c5995.tar.xz
wireguard-tools-1ad6b17c35d98677459b32fdbeba1129b80c5995.zip
extract-{handshakes,keys}: rework for upstream kernel
Now that WireGuard has been upstreamed and the repos split, we have to look elsewhere for these headers. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--contrib/extract-handshakes/Makefile7
-rw-r--r--contrib/extract-handshakes/offset-finder.c2
-rw-r--r--contrib/extract-keys/Makefile7
-rw-r--r--contrib/extract-keys/config.c6
4 files changed, 6 insertions, 16 deletions
diff --git a/contrib/extract-handshakes/Makefile b/contrib/extract-handshakes/Makefile
index 77b42f1..241b0d5 100644
--- a/contrib/extract-handshakes/Makefile
+++ b/contrib/extract-handshakes/Makefile
@@ -20,10 +20,5 @@ clean:
.PHONY: clean
else
-offset-finder-m := offset-finder.o
-oldsrc := $(src)
-src := $(src)/../../../src
-include $(src)/compat/Kbuild.include
-include $(src)/crypto/Kbuild.include
-src := $(oldsrc)
+obj-m := offset-finder.o
endif
diff --git a/contrib/extract-handshakes/offset-finder.c b/contrib/extract-handshakes/offset-finder.c
index 1b54cf3..4c10341 100644
--- a/contrib/extract-handshakes/offset-finder.c
+++ b/contrib/extract-handshakes/offset-finder.c
@@ -11,7 +11,7 @@ struct def {
extern const struct def defs[];
#ifdef __KERNEL__
-#include "../../../src/noise.h"
+#include "../drivers/net/wireguard/noise.h"
const struct def defs[] = {
{ "LOCAL_STATIC_PRIVATE_KEY", offsetof(struct noise_static_identity, static_private), offsetof(struct noise_handshake, static_identity) },
diff --git a/contrib/extract-keys/Makefile b/contrib/extract-keys/Makefile
index 1f7308d..53e7767 100644
--- a/contrib/extract-keys/Makefile
+++ b/contrib/extract-keys/Makefile
@@ -23,10 +23,5 @@ clean:
.PHONY: clean
else
-config-m := config.o
-oldsrc := $(src)
-src := $(src)/../../../src
-include $(src)/compat/Kbuild.include
-include $(src)/crypto/Kbuild.include
-src := $(oldsrc)
+obj-m := config.o
endif
diff --git a/contrib/extract-keys/config.c b/contrib/extract-keys/config.c
index 640c61b..59009ef 100644
--- a/contrib/extract-keys/config.c
+++ b/contrib/extract-keys/config.c
@@ -10,9 +10,9 @@ struct def {
extern const struct def defs[];
#ifdef __KERNEL__
-#include "../../../src/device.h"
-#include "../../../src/peer.h"
-#include "../../../src/noise.h"
+#include "../drivers/net/wireguard/device.h"
+#include "../drivers/net/wireguard/peer.h"
+#include "../drivers/net/wireguard/noise.h"
const struct def defs[] = {
{ "SOCK_DEVICE_OFFSET", offsetof(struct sock, sk_user_data) },
{ "DEVICE_NAME_OFFSET", -ALIGN(sizeof(struct net_device), NETDEV_ALIGN) + offsetof(struct net_device, name) },