Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-11-08 06:33:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

deps: update go-tpm-tools (#4007)

Browse source 
* deps: bump go-tpm-tools et al

Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>

* bazel: ai patches

* go: remove unnecessary patches

---------

Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
This commit is contained in:
Moritz Sanft 2025-10-29 10:54:23 +01:00 • committed by GitHub
parent a6f5b20acf
commit 53e3552494
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 125 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
3rdparty/bazel/com_github_google_go_eventlog/BUILD.bazel vendored Normal file
View file

@ -0,0 +1,7 @@
exports_files([
"wellknown.patch",
"register.patch",
"tcg.patch",
"extract.patch",
"ccel.patch",
])

11
3rdparty/bazel/com_github_google_go_eventlog/ccel.patch vendored Normal file
View file

@ -0,0 +1,11 @@
--- ccel/BUILD.bazel
+++ ccel/BUILD.bazel
@@ -9,6 +9,7 @@
importpath = "github.com/google/go-eventlog/ccel",
visibility = ["//visibility:public"],
deps = [
"//extract",
+ "//proto/state",
"//register",
"//tcg",
],

10
3rdparty/bazel/com_github_google_go_eventlog/extract.patch vendored Normal file
View file

@ -0,0 +1,10 @@
--- extract/BUILD.bazel
+++ extract/BUILD.bazel
@@ -11,6 +11,7 @@
importpath = "github.com/google/go-eventlog/extract",
visibility = ["//visibility:public"],
deps = [
+ "//proto/state",
"//tcg",
"//wellknown",
"@com_github_google_go_tpm//legacy/tpm2",

14
3rdparty/bazel/com_github_google_go_eventlog/register.patch vendored Normal file
View file

@ -0,0 +1,14 @@
--- register/BUILD.bazel
+++ register/BUILD.bazel
@@ -9,7 +9,10 @@
],
importpath = "github.com/google/go-eventlog/register",
visibility = ["//visibility:public"],
- deps = ["@com_github_google_go_tpm//legacy/tpm2"],
+ deps = [
+ "//proto/state",
+ "@com_github_google_go_tpm//legacy/tpm2",
+ ],
)
alias(

10
3rdparty/bazel/com_github_google_go_eventlog/tcg.patch vendored Normal file
View file

@ -0,0 +1,10 @@
--- tcg/BUILD.bazel
+++ tcg/BUILD.bazel
@@ -9,6 +9,7 @@
importpath = "github.com/google/go-eventlog/tcg",
visibility = ["//visibility:public"],
deps = [
+ "//proto/state",
"//register",
"@com_github_google_go_tpm//legacy/tpm2",
],

12
3rdparty/bazel/com_github_google_go_eventlog/wellknown.patch vendored Normal file
View file

@ -0,0 +1,12 @@
--- wellknown/BUILD.bazel
+++ wellknown/BUILD.bazel
@@ -13,6 +13,9 @@
],
importpath = "github.com/google/go-eventlog/wellknown",
visibility = ["//visibility:public"],
+ deps = [
+ "//proto/state",
+ ],
)
alias(

26
3rdparty/bazel/com_github_google_go_tpm_tools/com_github_google_go_tpm_tools.orig vendored
View file

@ -10,12 +10,18 @@ go_library(
],
cgo = True,
clinkopts = select({
"@io_bazel_rules_go//go/platform:darwin": [
"@io_bazel_rules_go//go/platform:darwin_amd64": [
"-L/usr/local/opt/openssl/lib",
],
"@io_bazel_rules_go//go/platform:ios": [
"@io_bazel_rules_go//go/platform:darwin_arm64": [
"-L/opt/homebrew/opt/openssl/lib",
],
"@io_bazel_rules_go//go/platform:ios_amd64": [
"-L/usr/local/opt/openssl/lib",
],
"@io_bazel_rules_go//go/platform:ios_arm64": [
"-L/opt/homebrew/opt/openssl/lib",
],
"//conditions:default": [],
}),
copts = [
@ -45,7 +51,6 @@ go_library(
"-fstack-protector-all",
],
"@io_bazel_rules_go//go/platform:darwin": [
"-I/usr/local/opt/openssl/include",
"-fstack-protector-all",
],
"@io_bazel_rules_go//go/platform:dragonfly": [
@ -58,7 +63,6 @@ go_library(
"-fstack-protector-all",
],
"@io_bazel_rules_go//go/platform:ios": [
"-I/usr/local/opt/openssl/include",
"-fstack-protector-all",
],
"@io_bazel_rules_go//go/platform:js": [
@ -86,6 +90,20 @@ go_library(
"-fstack-protector-all",
],
"//conditions:default": [],
}) + select({
"@io_bazel_rules_go//go/platform:darwin_amd64": [
"-I/usr/local/opt/openssl/include",
],
"@io_bazel_rules_go//go/platform:darwin_arm64": [
"-I/opt/homebrew/opt/openssl/include",
],
"@io_bazel_rules_go//go/platform:ios_amd64": [
"-I/usr/local/opt/openssl/include",
],
"@io_bazel_rules_go//go/platform:ios_arm64": [
"-I/opt/homebrew/opt/openssl/include",
],
"//conditions:default": [],
}),
importpath = "github.com/google/go-tpm-tools/simulator/internal",
visibility = ["//simulator:__subpackages__"],

28
3rdparty/bazel/com_github_google_go_tpm_tools/com_github_google_go_tpm_tools.patch vendored
View file

@ -1,6 +1,6 @@
--- simulator/internal/BUILD.bazel
+++ simulator/internal/BUILD.bazel
@@ -4,89 +4,14 @@ go_library(
@@ -4,107 +4,14 @@
name = "internal",
srcs = [
"doc.go",
@ -10,12 +10,18 @@
],
cgo = True,
- clinkopts = select({
- "@io_bazel_rules_go//go/platform:darwin": [
- "@io_bazel_rules_go//go/platform:darwin_amd64": [
- "-L/usr/local/opt/openssl/lib",
- ],
- "@io_bazel_rules_go//go/platform:ios": [
- "@io_bazel_rules_go//go/platform:darwin_arm64": [
- "-L/opt/homebrew/opt/openssl/lib",
- ],
- "@io_bazel_rules_go//go/platform:ios_amd64": [
- "-L/usr/local/opt/openssl/lib",
- ],
- "@io_bazel_rules_go//go/platform:ios_arm64": [
- "-L/opt/homebrew/opt/openssl/lib",
- ],
- "//conditions:default": [],
- }),
+ cdeps = ["//simulator/ms-tpm-20-ref:ms_tpm_20_ref"],
@ -46,7 +52,6 @@
- "-fstack-protector-all",
- ],
- "@io_bazel_rules_go//go/platform:darwin": [
- "-I/usr/local/opt/openssl/include",
- "-fstack-protector-all",
- ],
- "@io_bazel_rules_go//go/platform:dragonfly": [
@ -59,7 +64,6 @@
- "-fstack-protector-all",
- ],
- "@io_bazel_rules_go//go/platform:ios": [
- "-I/usr/local/opt/openssl/include",
- "-fstack-protector-all",
- ],
- "@io_bazel_rules_go//go/platform:js": [
@ -87,6 +91,20 @@
- "-fstack-protector-all",
- ],
- "//conditions:default": [],
- }) + select({
- "@io_bazel_rules_go//go/platform:darwin_amd64": [
- "-I/usr/local/opt/openssl/include",
- ],
- "@io_bazel_rules_go//go/platform:darwin_arm64": [
- "-I/opt/homebrew/opt/openssl/include",
- ],
- "@io_bazel_rules_go//go/platform:ios_amd64": [
- "-I/usr/local/opt/openssl/include",
- ],
- "@io_bazel_rules_go//go/platform:ios_arm64": [
- "-I/opt/homebrew/opt/openssl/include",
- ],
- "//conditions:default": [],
- }),
+ "-fno-sanitize=all", # relax sanitizer checks for this test-only dependency
+ ],

10
MODULE.bazel
View file

@ -206,3 +206,13 @@ go_deps.gazelle_override(
build_file_generation = "on",
path = "github.com/cncf/xds/go",
)
go_deps.module_override(
patches = [
"//3rdparty/bazel/com_github_google_go_eventlog:wellknown.patch",
"//3rdparty/bazel/com_github_google_go_eventlog:register.patch",
"//3rdparty/bazel/com_github_google_go_eventlog:tcg.patch",
"//3rdparty/bazel/com_github_google_go_eventlog:extract.patch",
"//3rdparty/bazel/com_github_google_go_eventlog:ccel.patch",
],
path = "github.com/google/go-eventlog",
)

3
go.mod
View file

@ -72,7 +72,7 @@ require (
github.com/google/go-sev-guest v0.13.0
github.com/google/go-tdx-guest v0.3.2-0.20250814004405-ffb0869e6f4d
github.com/google/go-tpm v0.9.6
github.com/google/go-tpm-tools v0.4.4
github.com/google/go-tpm-tools v0.4.6
github.com/google/uuid v1.6.0
github.com/googleapis/gax-go/v2 v2.15.0
github.com/gophercloud/gophercloud/v2 v2.8.0
@ -268,6 +268,7 @@ require (
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-configfs-tsm v0.3.3-0.20240919001351-b4b5b84fdcbc // indirect
github.com/google/go-containerregistry v0.20.6 // indirect
github.com/google/go-eventlog v0.0.2-0.20241213203620-f921bdc3aeb0 // indirect
github.com/google/go-tspi v0.3.0 // indirect
github.com/google/logger v1.1.1 // indirect
github.com/google/pprof v0.0.0-20250602020802-c6617b811d0e // indirect

6
go.sum
View file

@ -437,12 +437,14 @@ github.com/google/go-configfs-tsm v0.3.3-0.20240919001351-b4b5b84fdcbc h1:SG12DW
github.com/google/go-configfs-tsm v0.3.3-0.20240919001351-b4b5b84fdcbc/go.mod h1:EL1GTDFMb5PZQWDviGfZV9n87WeGTR/JUg13RfwkgRo=
github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=
github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=
github.com/google/go-eventlog v0.0.2-0.20241213203620-f921bdc3aeb0 h1:270O3tFxca1lAXm3JVWqUU4fHlK3EEIEYIfk4koWMkM=
github.com/google/go-eventlog v0.0.2-0.20241213203620-f921bdc3aeb0/go.mod h1:7huE5P8w2NTObSwSJjboHmB7ioBNblkijdzoVa2skfQ=
github.com/google/go-tdx-guest v0.3.2-0.20250814004405-ffb0869e6f4d h1:Ff8goEP/ue2/rZT5qyoRicuySCYDbAXEZS8Cf1fgsUo=
github.com/google/go-tdx-guest v0.3.2-0.20250814004405-ffb0869e6f4d/go.mod h1:uHy3VaNXNXhl0fiPxKqTxieeouqQmW6A0EfLcaeCYBk=
github.com/google/go-tpm v0.9.6 h1:Ku42PT4LmjDu1H5C5ISWLlpI1mj+Zq7sPGKoRw2XROA=
github.com/google/go-tpm v0.9.6/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
github.com/google/go-tpm-tools v0.4.4 h1:oiQfAIkc6xTy9Fl5NKTeTJkBTlXdHsxAofmQyxBKY98=
github.com/google/go-tpm-tools v0.4.4/go.mod h1:T8jXkp2s+eltnCDIsXR84/MTcVU9Ja7bh3Mit0pa4AY=
github.com/google/go-tpm-tools v0.4.6 h1:hwIwPG7w4z5eQEBq11gYw8YYr9xXLfBQ/0JsKyq5AJM=
github.com/google/go-tpm-tools v0.4.6/go.mod h1:MsVQbJnRhKDfWwf5zgr3cDGpj13P1uLAFF0wMEP/n5w=
github.com/google/go-tspi v0.3.0 h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus=
github.com/google/go-tspi v0.3.0/go.mod h1:xfMGI3G0PhxCdNVcYr1C4C+EizojDg/TXuX5by8CiHI=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=