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>

diff --git a/contrib/extract-handshakes/Makefile b/contrib/extract-handshakes/Makefile
index 77b42f1e4077820532dbe92a8ff7677bbacd2091..241b0d5d4044b19b0dbd278dab5e143d8f53c1e9 100644 (file)
--- 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 1b54cf3e2f06bf592a994a003d97553e0107ef26..4c1034175494b8ba1bbb4c52559832e0f878f2d5 100644 (file)
--- 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 1f7308d06b0f15f7d223c922914ff1a174a75900..53e77672a411a6d6f562517270b784f31746434e 100644 (file)
--- 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 640c61be066dce28c7cc3af2cfab1089e5efd2dd..59009ef9330be18eb7238af70746b3a1b403e211 100644 (file)
--- 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) },