From 21be4420d1d9fe7bd11db7d9efa926b0322c2368 Mon Sep 17 00:00:00 2001
From: Viktor Liu <viktor@netbird.io>
Date: Thu, 1 Oct 2026 09:56:22 +0200
Subject: [PATCH] Keep the macOS keychain code out of iOS and the PKCS#11
 driver out of Android

---
 client/internal/certproof/collect_darwin.go          | 2 ++
 client/internal/certproof/collect_other.go           | 2 +-
 client/internal/certproof/consoleuser_darwin.go      | 2 ++
 client/internal/certproof/consoleuser_darwin_test.go | 2 ++
 client/internal/certproof/helper_spawn.go            | 2 +-
 client/internal/certproof/helper_spawn_test.go       | 2 +-
 client/internal/certproof/keychain_darwin.go         | 2 ++
 client/internal/certproof/store_other.go             | 2 +-
 client/internal/certproof/store_other_test.go        | 2 +-
 client/internal/pkcs11/driver_linux.go               | 2 +-
 client/internal/pkcs11/driver_linux_test.go          | 2 +-
 client/internal/pkcs11/driver_stub.go                | 2 +-
 12 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/client/internal/certproof/collect_darwin.go b/client/internal/certproof/collect_darwin.go
index 149342690..de3a9fb12 100644
--- a/client/internal/certproof/collect_darwin.go
+++ b/client/internal/certproof/collect_darwin.go
@@ -1,3 +1,5 @@
+//go:build !ios
+
 package certproof
 
 import (
diff --git a/client/internal/certproof/collect_other.go b/client/internal/certproof/collect_other.go
index d9c49c807..852be0680 100644
--- a/client/internal/certproof/collect_other.go
+++ b/client/internal/certproof/collect_other.go
@@ -1,4 +1,4 @@
-//go:build !darwin && !windows
+//go:build (!darwin && !windows) || ios
 
 package certproof
 
diff --git a/client/internal/certproof/consoleuser_darwin.go b/client/internal/certproof/consoleuser_darwin.go
index 78e491b35..5f41bf7e1 100644
--- a/client/internal/certproof/consoleuser_darwin.go
+++ b/client/internal/certproof/consoleuser_darwin.go
@@ -1,3 +1,5 @@
+//go:build !ios
+
 package certproof
 
 import (
diff --git a/client/internal/certproof/consoleuser_darwin_test.go b/client/internal/certproof/consoleuser_darwin_test.go
index a3ecba217..d1881986f 100644
--- a/client/internal/certproof/consoleuser_darwin_test.go
+++ b/client/internal/certproof/consoleuser_darwin_test.go
@@ -1,3 +1,5 @@
+//go:build !ios
+
 package certproof
 
 import (
diff --git a/client/internal/certproof/helper_spawn.go b/client/internal/certproof/helper_spawn.go
index 6b2c35035..968cc3679 100644
--- a/client/internal/certproof/helper_spawn.go
+++ b/client/internal/certproof/helper_spawn.go
@@ -1,4 +1,4 @@
-//go:build darwin || windows
+//go:build (darwin && !ios) || windows
 
 package certproof
 
diff --git a/client/internal/certproof/helper_spawn_test.go b/client/internal/certproof/helper_spawn_test.go
index 5356a9b00..338a5f66a 100644
--- a/client/internal/certproof/helper_spawn_test.go
+++ b/client/internal/certproof/helper_spawn_test.go
@@ -1,4 +1,4 @@
-//go:build darwin || windows
+//go:build (darwin && !ios) || windows
 
 package certproof
 
diff --git a/client/internal/certproof/keychain_darwin.go b/client/internal/certproof/keychain_darwin.go
index 7bf4cb093..4613d1e9c 100644
--- a/client/internal/certproof/keychain_darwin.go
+++ b/client/internal/certproof/keychain_darwin.go
@@ -1,3 +1,5 @@
+//go:build !ios
+
 package certproof
 
 import (
diff --git a/client/internal/certproof/store_other.go b/client/internal/certproof/store_other.go
index be467fa51..a0bbc0c68 100644
--- a/client/internal/certproof/store_other.go
+++ b/client/internal/certproof/store_other.go
@@ -1,4 +1,4 @@
-//go:build !darwin && !windows
+//go:build (!darwin && !windows) || ios
 
 package certproof
 
diff --git a/client/internal/certproof/store_other_test.go b/client/internal/certproof/store_other_test.go
index 5787df9f9..6d1c4d52c 100644
--- a/client/internal/certproof/store_other_test.go
+++ b/client/internal/certproof/store_other_test.go
@@ -1,4 +1,4 @@
-//go:build !darwin && !windows
+//go:build (!darwin && !windows) || ios
 
 package certproof
 
diff --git a/client/internal/pkcs11/driver_linux.go b/client/internal/pkcs11/driver_linux.go
index 1ad8cd001..6faed4720 100644
--- a/client/internal/pkcs11/driver_linux.go
+++ b/client/internal/pkcs11/driver_linux.go
@@ -1,4 +1,4 @@
-//go:build pkcs11 && linux && (amd64 || arm64)
+//go:build pkcs11 && linux && !android && (amd64 || arm64)
 
 package pkcs11
 
diff --git a/client/internal/pkcs11/driver_linux_test.go b/client/internal/pkcs11/driver_linux_test.go
index b47b22890..408a3fabc 100644
--- a/client/internal/pkcs11/driver_linux_test.go
+++ b/client/internal/pkcs11/driver_linux_test.go
@@ -1,4 +1,4 @@
-//go:build pkcs11 && linux && (amd64 || arm64)
+//go:build pkcs11 && linux && !android && (amd64 || arm64)
 
 package pkcs11
 
diff --git a/client/internal/pkcs11/driver_stub.go b/client/internal/pkcs11/driver_stub.go
index 1f870bd8e..30f461cec 100644
--- a/client/internal/pkcs11/driver_stub.go
+++ b/client/internal/pkcs11/driver_stub.go
@@ -1,4 +1,4 @@
-//go:build !(pkcs11 && linux && (amd64 || arm64))
+//go:build !(pkcs11 && linux && !android && (amd64 || arm64))
 
 package pkcs11