chore: update dependency

Signed-off-by: Christian Walter <[email protected]>

cmd/core/txt-prov/tools.go

@@ -11,7 +11,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/tools"
 	"github.com/9elements/go-linux-lowlevel-hw/pkg/hwapi"
 	"github.com/google/go-tpm/tpm"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/term"
 )

cmd/core/txt-suite/cmd.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/9elements/converged-security-suite/v2/pkg/test"
 	"github.com/9elements/converged-security-suite/v2/pkg/tools"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 
 	"github.com/9elements/go-linux-lowlevel-hw/pkg/hwapi"
 

cmd/exp/pcr0tool/commands/bruteforce_acm_policy_status/command.go

@@ -28,7 +28,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/bruteforcer"
 	"github.com/9elements/converged-security-suite/v2/pkg/registers"
 	"github.com/9elements/converged-security-suite/v2/pkg/uefi"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 // Command is the implementation of `commands.Command`.

cmd/exp/pcr0tool/commands/pcrread/command.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/subsystems/trustchains/tpm/pcr"
 	"github.com/9elements/converged-security-suite/v2/pkg/tpm"

cmd/exp/pcr0tool/commands/sum/command.go

@@ -26,7 +26,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/registers"
 	"github.com/9elements/converged-security-suite/v2/pkg/tpmeventlog"
 	"github.com/facebookincubator/go-belt/tool/logger"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 func usageAndExit() {

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/go-ng/slices v0.0.0-20230703171042-6195d35636a2
 	github.com/go-ng/xmath v0.0.0-20230704233441-028f5ea62335
 	github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259
-	github.com/google/go-attestation v0.4.3
+	github.com/google/go-attestation v0.5.1
 	github.com/google/go-tpm v0.9.1
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
@@ -44,8 +44,8 @@ require (
 	github.com/go-ng/xatomic v0.0.0-20230519181013-85c0ec87e55f // indirect
 	github.com/go-ng/xsort v0.0.0-20220617174223-1d146907bccc // indirect
 	github.com/godbus/dbus/v5 v5.0.4 // indirect
-	github.com/google/certificate-transparency-go v1.1.1 // indirect
-	github.com/google/go-tspi v0.2.1-0.20190423175329-115dea689aad // indirect
+	github.com/google/certificate-transparency-go v1.1.2 // indirect
+	github.com/google/go-tspi v0.3.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/intel-go/cpuid v0.0.0-20220614022739-219e067757cb // indirect
 	github.com/jedib0t/go-pretty/v6 v6.4.6 // indirect

pkg/bootflow/actions/tpmactions/tpm_extend.go

@@ -7,7 +7,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/subsystems/trustchains/tpm"
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/subsystems/trustchains/tpm/pcr"
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/types"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 // TPMExtend is a representation of `TPM2_PCR_Extend`.

pkg/bootflow/steps/intelsteps/measure_pcr0_data.go

@@ -16,7 +16,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/types"
 	"github.com/9elements/converged-security-suite/v2/pkg/registers"
 	"github.com/9elements/converged-security-suite/v2/pkg/tpmeventlog"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	pkgbytes "github.com/linuxboot/fiano/pkg/bytes"
 	manifest "github.com/linuxboot/fiano/pkg/intel/metadata/cbnt"
 )

pkg/bootflow/subsystems/trustchains/tpm/command_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/facebookincubator/go-belt/tool/logger"
 	"github.com/facebookincubator/go-belt/tool/logger/implementation/logrus"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/stretchr/testify/require"
 )
 

pkg/bootflow/subsystems/trustchains/tpm/pcr/algorithm.go

@@ -1,6 +1,6 @@
 package pcr
 
-import "github.com/google/go-tpm/tpm2"
+import "github.com/google/go-tpm/legacy/tpm2"
 
 // Algorithm is just a type-alias.
 type Algorithm = tpm2.Algorithm

pkg/bootflow/subsystems/trustchains/tpm/pcrbruteforcer/reproduce_event_log.go

@@ -25,7 +25,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/tpmeventlog"
 	"github.com/facebookincubator/go-belt/tool/experimental/errmon"
 	"github.com/facebookincubator/go-belt/tool/logger"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	pkgbytes "github.com/linuxboot/fiano/pkg/bytes"
 	"github.com/xaionaro-go/unhash/pkg/unhash"
 	"golang.org/x/exp/constraints"

pkg/bootflow/subsystems/trustchains/tpm/pcrbruteforcer/reproduce_expected_pcr0_test.go

@@ -19,7 +19,7 @@ import (
 	"github.com/facebookincubator/go-belt/tool/logger"
 	"github.com/facebookincubator/go-belt/tool/logger/implementation/logrus"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/stretchr/testify/require"
 )
 

pkg/bootflow/subsystems/trustchains/tpm/pools.go

@@ -4,7 +4,7 @@ import (
 	"hash"
 	"sync"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 var hasherPools = [0xffff]sync.Pool{}

pkg/bootflow/subsystems/trustchains/tpm/tpm.go

@@ -6,7 +6,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/subsystems/trustchains/tpm/pcr"
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/types"
 	"github.com/9elements/converged-security-suite/v2/pkg/tpmeventlog"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 const (

pkg/provisioning/txt/auxdefine.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	tpm2 "github.com/google/go-tpm/tpm2"
+	tpm2 "github.com/google/go-tpm/legacy/tpm2"
 
 	log "github.com/sirupsen/logrus"
 )

pkg/provisioning/txt/policy.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	tpm2 "github.com/google/go-tpm/tpm2"
+	tpm2 "github.com/google/go-tpm/legacy/tpm2"
 	tpmutil "github.com/google/go-tpm/tpmutil"
 )
 

pkg/provisioning/txt/psdefine.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	tpm2 "github.com/google/go-tpm/tpm2"
+	tpm2 "github.com/google/go-tpm/legacy/tpm2"
 
 	log "github.com/sirupsen/logrus"
 )

pkg/provisioning/txt/psdelete.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/go-tpm/tpmutil"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 
 	log "github.com/sirupsen/logrus"
 )

pkg/provisioning/txt/pswrite.go

@@ -7,7 +7,7 @@ import (
 	"io"
 
 	"github.com/9elements/converged-security-suite/v2/pkg/tools"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/google/go-tpm/tpmutil"
 
 	log "github.com/sirupsen/logrus"

pkg/provisioning/txt/show.go

@@ -5,7 +5,7 @@ import (
 	"io"
 
 	tools "github.com/9elements/converged-security-suite/v2/pkg/tools"
-	tpm2 "github.com/google/go-tpm/tpm2"
+	tpm2 "github.com/google/go-tpm/legacy/tpm2"
 	log "github.com/sirupsen/logrus"
 )
 

pkg/provisioning/txt/structures.go

@@ -3,7 +3,7 @@ package txt
 import (
 	"crypto"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/google/go-tpm/tpmutil"
 )
 

pkg/test/test_preset.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/9elements/converged-security-suite/v2/pkg/tools"
 	"github.com/9elements/go-linux-lowlevel-hw/pkg/hwapi"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 // PreSet set of pre-defined assumptions

pkg/test/test_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/9elements/converged-security-suite/v2/pkg/tools"
 	"github.com/9elements/go-linux-lowlevel-hw/pkg/hwapi"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 func TestTest_Run(t *testing.T) {

pkg/test/tpm.go

@@ -10,7 +10,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/tools"
 	"github.com/9elements/go-linux-lowlevel-hw/pkg/hwapi"
 	tpm1 "github.com/google/go-tpm/tpm"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 // nolint

pkg/tools/acm.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/linuxboot/fiano/pkg/intel/metadata/fit"
 
 	log "github.com/sirupsen/logrus"

pkg/tools/lcp.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 
 	log "github.com/sirupsen/logrus"
 )

pkg/tpm/read_pcr_from_tpm.go

@@ -8,7 +8,7 @@ import (
 	"github.com/9elements/converged-security-suite/v2/pkg/errors"
 	"github.com/9elements/go-linux-lowlevel-hw/pkg/hwapi"
 	tpm1 "github.com/google/go-tpm/tpm"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/marcoguerri/go-tpm-tcti/abrmd"
 )
 

pkg/tpmeventlog/replay_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/subsystems/trustchains/tpm/pcr"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 	"github.com/stretchr/testify/require"
 )
 

pkg/tpmeventlog/tpm_event_log.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/9elements/converged-security-suite/v2/pkg/bootflow/subsystems/trustchains/tpm/pcr"
 	"github.com/google/go-attestation/attest"
-	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/legacy/tpm2"
 )
 
 // TPMEventLog is a parsed EventLog.