diff --git a/cmd/core/txt-prov/tools.go b/cmd/core/txt-prov/tools.go index 97f298c9..4d47f95a 100644 --- a/cmd/core/txt-prov/tools.go +++ b/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" ) diff --git a/cmd/core/txt-suite/cmd.go b/cmd/core/txt-suite/cmd.go index 7923a841..ad326a84 100644 --- a/cmd/core/txt-suite/cmd.go +++ b/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" diff --git a/cmd/exp/pcr0tool/commands/bruteforce_acm_policy_status/command.go b/cmd/exp/pcr0tool/commands/bruteforce_acm_policy_status/command.go index cd1052bf..bd94b1c7 100644 --- a/cmd/exp/pcr0tool/commands/bruteforce_acm_policy_status/command.go +++ b/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`. diff --git a/cmd/exp/pcr0tool/commands/pcrread/command.go b/cmd/exp/pcr0tool/commands/pcrread/command.go index 7fa16396..86775cc3 100644 --- a/cmd/exp/pcr0tool/commands/pcrread/command.go +++ b/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" diff --git a/cmd/exp/pcr0tool/commands/sum/command.go b/cmd/exp/pcr0tool/commands/sum/command.go index b24f7790..fe9d93cf 100644 --- a/cmd/exp/pcr0tool/commands/sum/command.go +++ b/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() { diff --git a/pkg/bootflow/actions/tpmactions/tpm_extend.go b/pkg/bootflow/actions/tpmactions/tpm_extend.go index 3e8a22e3..c57dd22b 100644 --- a/pkg/bootflow/actions/tpmactions/tpm_extend.go +++ b/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`. diff --git a/pkg/bootflow/steps/intelsteps/measure_pcr0_data.go b/pkg/bootflow/steps/intelsteps/measure_pcr0_data.go index 82d223b3..969e2785 100644 --- a/pkg/bootflow/steps/intelsteps/measure_pcr0_data.go +++ b/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" ) diff --git a/pkg/bootflow/subsystems/trustchains/tpm/command_test.go b/pkg/bootflow/subsystems/trustchains/tpm/command_test.go index cedab721..11f83745 100644 --- a/pkg/bootflow/subsystems/trustchains/tpm/command_test.go +++ b/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" ) diff --git a/pkg/bootflow/subsystems/trustchains/tpm/pcr/algorithm.go b/pkg/bootflow/subsystems/trustchains/tpm/pcr/algorithm.go index ee9a66a5..9fc2beb2 100644 --- a/pkg/bootflow/subsystems/trustchains/tpm/pcr/algorithm.go +++ b/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 diff --git a/pkg/bootflow/subsystems/trustchains/tpm/pcrbruteforcer/reproduce_event_log.go b/pkg/bootflow/subsystems/trustchains/tpm/pcrbruteforcer/reproduce_event_log.go index e2b22522..2d1647f2 100644 --- a/pkg/bootflow/subsystems/trustchains/tpm/pcrbruteforcer/reproduce_event_log.go +++ b/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" diff --git a/pkg/bootflow/subsystems/trustchains/tpm/pcrbruteforcer/reproduce_expected_pcr0_test.go b/pkg/bootflow/subsystems/trustchains/tpm/pcrbruteforcer/reproduce_expected_pcr0_test.go index a5cc7c51..878e0be9 100644 --- a/pkg/bootflow/subsystems/trustchains/tpm/pcrbruteforcer/reproduce_expected_pcr0_test.go +++ b/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" ) diff --git a/pkg/bootflow/subsystems/trustchains/tpm/pools.go b/pkg/bootflow/subsystems/trustchains/tpm/pools.go index eacf48ec..625d2d0d 100644 --- a/pkg/bootflow/subsystems/trustchains/tpm/pools.go +++ b/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{} diff --git a/pkg/bootflow/subsystems/trustchains/tpm/tpm.go b/pkg/bootflow/subsystems/trustchains/tpm/tpm.go index 9e5aa3fa..671f974e 100644 --- a/pkg/bootflow/subsystems/trustchains/tpm/tpm.go +++ b/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 ( diff --git a/pkg/provisioning/txt/auxdefine.go b/pkg/provisioning/txt/auxdefine.go index 0a70507b..e8850fb4 100644 --- a/pkg/provisioning/txt/auxdefine.go +++ b/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" ) diff --git a/pkg/provisioning/txt/policy.go b/pkg/provisioning/txt/policy.go index a5e4f3e1..455cee31 100644 --- a/pkg/provisioning/txt/policy.go +++ b/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" ) diff --git a/pkg/provisioning/txt/psdefine.go b/pkg/provisioning/txt/psdefine.go index 80e7ce79..8793065b 100644 --- a/pkg/provisioning/txt/psdefine.go +++ b/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" ) diff --git a/pkg/provisioning/txt/psdelete.go b/pkg/provisioning/txt/psdelete.go index f6c8e974..cf890bd3 100644 --- a/pkg/provisioning/txt/psdelete.go +++ b/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" ) diff --git a/pkg/provisioning/txt/pswrite.go b/pkg/provisioning/txt/pswrite.go index ae8f37d4..6b5e6bac 100644 --- a/pkg/provisioning/txt/pswrite.go +++ b/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" diff --git a/pkg/provisioning/txt/show.go b/pkg/provisioning/txt/show.go index 78a04a52..6c017dbb 100644 --- a/pkg/provisioning/txt/show.go +++ b/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" ) diff --git a/pkg/provisioning/txt/structures.go b/pkg/provisioning/txt/structures.go index c25425ce..2320656a 100644 --- a/pkg/provisioning/txt/structures.go +++ b/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" ) diff --git a/pkg/test/test_preset.go b/pkg/test/test_preset.go index feb12fc5..a87561a8 100644 --- a/pkg/test/test_preset.go +++ b/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 diff --git a/pkg/test/test_test.go b/pkg/test/test_test.go index f7090925..faea8af7 100644 --- a/pkg/test/test_test.go +++ b/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) { diff --git a/pkg/test/tpm.go b/pkg/test/tpm.go index 5c8bc04b..d9658c32 100644 --- a/pkg/test/tpm.go +++ b/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 diff --git a/pkg/tools/acm.go b/pkg/tools/acm.go index 56555130..a49f2f34 100644 --- a/pkg/tools/acm.go +++ b/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" diff --git a/pkg/tools/lcp.go b/pkg/tools/lcp.go index 81df243e..9d9f74a2 100644 --- a/pkg/tools/lcp.go +++ b/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" ) diff --git a/pkg/tpm/read_pcr_from_tpm.go b/pkg/tpm/read_pcr_from_tpm.go index f6774743..af5ea080 100644 --- a/pkg/tpm/read_pcr_from_tpm.go +++ b/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" ) diff --git a/pkg/tpmeventlog/replay_test.go b/pkg/tpmeventlog/replay_test.go index ba62a102..56afd014 100644 --- a/pkg/tpmeventlog/replay_test.go +++ b/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" ) diff --git a/pkg/tpmeventlog/tpm_event_log.go b/pkg/tpmeventlog/tpm_event_log.go index 0f283196..86157551 100644 --- a/pkg/tpmeventlog/tpm_event_log.go +++ b/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.