fix building pkcs11 features on linux

diff --git a/mtls/BUILD.bazel b/mtls/BUILD.bazel
index 6ef044711ff5aed14d9d4a112f966667b46c437b..41952397c37aa91966c58cf03f2f7e67f93e8156 100644 (file)
--- a/mtls/BUILD.bazel
+++ b/mtls/BUILD.bazel
@@ -4,30 +4,36 @@ go_library(
     name = "mtls",
     srcs = [
         "identity.go",
+        "pkcs11.go",
         "provider_anonymous.go",
         "provider_file.go",
         "provider_interface.go",
         "provider_keychain_macos.go",
         "provider_shared.go",
+        "provider_tpm2_pkcs11.go",
         "verify_names.go",
         "verify_roots.go",
     ],
+    cgo = select({
+        "@rules_go//go/platform:linux": True,
+        "//conditions:default": False,
+    }),
     importpath = "go.fuhry.dev/runtime/mtls",
     visibility = ["//visibility:public"],
     deps = [
+        "//constants",
         "//mtls/certutil",
         "//mtls/fsnotify",
         "//utils/fsutil",
         "//utils/hashset",
         "//utils/log",
+        "@com_github_thalesignite_crypto11//:crypto11",
     ] + select({
         "@rules_go//go/platform:darwin": [
-            "//constants",
             "//utils/stringmatch",
             "@com_github_keybase_go_keychain//:go-keychain",
         ],
         "@rules_go//go/platform:ios": [
-            "//constants",
             "//utils/stringmatch",
             "@com_github_keybase_go_keychain//:go-keychain",
         ],

diff --git a/mtls/pkcs11.go b/mtls/pkcs11.go
index 1e40ab401314268350e398f30ae62dd546ddd4dd..fb5835dc18eac58fc40a31fb5b30f029c96a0bbc 100644 (file)
--- a/mtls/pkcs11.go
+++ b/mtls/pkcs11.go
@@ -1,5 +1,4 @@
-//go:build pkcs11
-// +build pkcs11
+//go:build cgo
 
 package mtls
 
@@ -22,7 +21,9 @@ const (
 var pkcs11Logger = log.WithPrefix("mtls.provider_tpm2_pkcs11")
 
 var pkcs11ModulePaths = []string{
+       "/usr/lib/libtpm2_pkcs11.so",
        "/usr/lib/pkcs11/libtpm2_pkcs11.so",
+       "/usr/lib/x86_64-linux-gnu/libtpm2_pkcs11.so",
        "/usr/lib/x86_64-linux-gnu/pkcs11/libtpm2_pkcs11.so",
 }
 

diff --git a/mtls/provider_tpm2_pkcs11.go b/mtls/provider_tpm2_pkcs11.go
index 67d0636f0281a4ca4aedc88546f9fdaa1ede2698..aafd50b6b8ec83591bd3302b934e705ed33d6ecd 100644 (file)
--- a/mtls/provider_tpm2_pkcs11.go
+++ b/mtls/provider_tpm2_pkcs11.go
@@ -1,5 +1,4 @@
-//go:build pkcs11
-// +build pkcs11
+//go:build cgo
 
 package mtls