update pillar go-tpm package path

go-tpm has move the old tpm2 interfaces to "legacy/tpm2", this commit updates tpm2 import paths in pillar to reflect the change and make it possible to use "legacy/tpm2/credactivation" apis. Signed-off-by: Shahriyar Jalayeri <[email protected]>
lf-edge · Aug 6, 2024 · 98acc79 · 98acc79
1 parent eda3632
commit 98acc79
Show file tree

Hide file tree

Showing 52 changed files with 857 additions and 838 deletions.
diff --git a/pkg/pillar/cmd/tpmmgr/tpmmgr.go b/pkg/pillar/cmd/tpmmgr/tpmmgr.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/google/go-tpm/tpmutil"
 	"github.com/lf-edge/eve/pkg/pillar/agentbase"
 	"github.com/lf-edge/eve/pkg/pillar/agentlog"

diff --git a/pkg/pillar/evetpm/encryptdecypt.go b/pkg/pillar/evetpm/encryptdecypt.go
@@ -15,7 +15,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/lf-edge/eve/pkg/pillar/base"
 	"github.com/lf-edge/eve/pkg/pillar/types"
 )

diff --git a/pkg/pillar/evetpm/tpm.go b/pkg/pillar/evetpm/tpm.go
@@ -18,7 +18,7 @@ import (
 	"sort"
 	"unsafe"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/google/go-tpm/tpmutil"
 	"github.com/lf-edge/eve-api/go/info"
 	"github.com/lf-edge/eve/pkg/pillar/base"

diff --git a/pkg/pillar/evetpm/tpm_test.go b/pkg/pillar/evetpm/tpm_test.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/google/go-tpm/tpmutil"
 	"github.com/lf-edge/eve/pkg/pillar/base"
 	fileutils "github.com/lf-edge/eve/pkg/pillar/utils/file"

diff --git a/pkg/pillar/go.mod b/pkg/pillar/go.mod
@@ -1,6 +1,7 @@
 module github.com/lf-edge/eve/pkg/pillar
 
-go 1.21
+go 1.22
+
 
 require (
 	github.com/anatol/smart.go v0.0.0-20220615232124-371056cd18c3
@@ -20,7 +21,7 @@ require (
 	github.com/golang/protobuf v1.5.4
 	github.com/google/go-cmp v0.6.0
 	github.com/google/go-containerregistry v0.14.0
-	github.com/google/go-tpm v0.3.0
+	github.com/google/go-tpm v0.9.1
 	github.com/google/gopacket v1.1.19
 	github.com/gorilla/websocket v1.5.0
 	github.com/grandcat/zeroconf v1.0.0

diff --git a/pkg/pillar/go.sum b/pkg/pillar/go.sum
@@ -1198,10 +1198,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
 github.com/google/go-containerregistry v0.14.0 h1:z58vMqHxuwvAsVwvKEkmVBz2TlgBgH5k6koEXBtlYkw=
 github.com/google/go-containerregistry v0.14.0/go.mod h1:aiJ2fp/SXvkWgmYHioXnbMdlgB8eXiiYOY55gfN91Wk=
-github.com/google/go-tpm v0.1.2-0.20190725015402-ae6dd98980d4/go.mod h1:H9HbmUG2YgV/PHITkO7p6wxEEj/v5nlsVWIwumwH2NI=
-github.com/google/go-tpm v0.3.0 h1:3RosPAvx+WlokvPGxiMgK+zC3B7k8Lu/qLbpuNFm9VA=
-github.com/google/go-tpm v0.3.0/go.mod h1:iVLWvrPp/bHeEkxTFi9WG6K9w0iy2yIszHwZGHPbzAw=
-github.com/google/go-tpm-tools v0.0.0-20190906225433-1614c142f845/go.mod h1:AVfHadzbdzHo54inR2x1v640jdi1YSi3NauM2DUsxk0=
+github.com/google/go-tpm v0.9.1 h1:0pGc4X//bAlmZzMKf8iz6IsDo1nYTbYJ6FZN/rg4zdM=
+github.com/google/go-tpm v0.9.1/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=

diff --git a/...r/github.com/google/go-tpm/tpm2/README.md → ...b.com/google/go-tpm/legacy/tpm2/README.md b/...r/github.com/google/go-tpm/tpm2/README.md → ...b.com/google/go-tpm/legacy/tpm2/README.md
diff --git a/...ithub.com/google/go-tpm/tpm2/constants.go → ...om/google/go-tpm/legacy/tpm2/constants.go b/...ithub.com/google/go-tpm/tpm2/constants.go → ...om/google/go-tpm/legacy/tpm2/constants.go
diff --git a/...or/github.com/google/go-tpm/tpm2/error.go → ...ub.com/google/go-tpm/legacy/tpm2/error.go b/...or/github.com/google/go-tpm/tpm2/error.go → ...ub.com/google/go-tpm/legacy/tpm2/error.go