From 5777abf7aaba3ae3869b1863ae771aa06dec4578 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Feb 2022 17:30:55 +0000
Subject: [PATCH 1/2] Bump github.com/google/go-tpm from 0.3.2 to 0.3.3

Bumps [github.com/google/go-tpm](https://github.com/google/go-tpm) from 0.3.2 to 0.3.3.
- [Release notes](https://github.com/google/go-tpm/releases)
- [Commits](https://github.com/google/go-tpm/compare/v0.3.2...v0.3.3)

---
updated-dependencies:
- dependency-name: github.com/google/go-tpm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 6032922e87..3a928b6db0 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.2
 	github.com/google/go-cmp v0.5.7
-	github.com/google/go-tpm v0.3.2
+	github.com/google/go-tpm v0.3.3
 	github.com/google/go-tpm-tools v0.3.2
 	github.com/googleapis/gax-go/v2 v2.1.1
 	github.com/gorilla/handlers v1.5.1
diff --git a/go.sum b/go.sum
index 4b7ab1b558..ff71733680 100644
--- a/go.sum
+++ b/go.sum
@@ -566,8 +566,9 @@ github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVgg
 github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no=
 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/go.mod h1:iVLWvrPp/bHeEkxTFi9WG6K9w0iy2yIszHwZGHPbzAw=
-github.com/google/go-tpm v0.3.2 h1:3iQQ2dlEf+1no7CLlfLPYzxhQy7j2G/emBqU5okydaw=
 github.com/google/go-tpm v0.3.2/go.mod h1:j71sMBTfp3X5jPHz852ZOfQMUOf65Gb/Th8pRmp7fvg=
+github.com/google/go-tpm v0.3.3 h1:P/ZFNBZYXRxc+z7i5uyd8VP7MaDteuLZInzrH2idRGo=
+github.com/google/go-tpm v0.3.3/go.mod h1:9Hyn3rgnzWF9XBWVk6ml6A6hNkbWjNFlDQL51BeghL4=
 github.com/google/go-tpm-tools v0.0.0-20190906225433-1614c142f845/go.mod h1:AVfHadzbdzHo54inR2x1v640jdi1YSi3NauM2DUsxk0=
 github.com/google/go-tpm-tools v0.2.0/go.mod h1:npUd03rQ60lxN7tzeBJreG38RvWwme2N1reF/eeiBk4=
 github.com/google/go-tpm-tools v0.2.1/go.mod h1:npUd03rQ60lxN7tzeBJreG38RvWwme2N1reF/eeiBk4=
@@ -1611,6 +1612,7 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210629170331-7dc0b73dc9fb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

From a8d565999679345ba49e024ddc93336e689e191f Mon Sep 17 00:00:00 2001
From: Ryan Turner <turner@uber.com>
Date: Tue, 8 Feb 2022 18:01:18 +0000
Subject: [PATCH 2/2] Fix usage of changed API

Signed-off-by: Ryan Turner <turner@uber.com>
---
 pkg/agent/plugin/nodeattestor/tpmdevid/tpmutil/session.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/agent/plugin/nodeattestor/tpmdevid/tpmutil/session.go b/pkg/agent/plugin/nodeattestor/tpmdevid/tpmutil/session.go
index 8f0d9b8795..da4015dbcf 100644
--- a/pkg/agent/plugin/nodeattestor/tpmdevid/tpmutil/session.go
+++ b/pkg/agent/plugin/nodeattestor/tpmdevid/tpmutil/session.go
@@ -371,7 +371,7 @@ func (c *Session) createPolicySessionForEK() (tpmutil.Handle, error) {
 
 	// A detailed description of this command and its parameters can be found in TCG spec:
 	// https://www.trustedcomputinggroup.org/wp-content/uploads/TPM-Rev-2.0-Part-3-Commands-01.38.pdf#page=228
-	_, err = tpm2.PolicySecret(
+	_, _, err = tpm2.PolicySecret(
 		c.rwc,                  // 	rw:		TPM channel.
 		tpm2.HandleEndorsement, // 	entityHandle:	handle for an entity providing the authorization.
 		tpm2.AuthCommand{ // 		entityAuth:	entity authorization.