From 25f5b13c2cc6384da7f4c14cc22c06f4ee432f48 Mon Sep 17 00:00:00 2001
From: Brandon Weeks <bweeks@google.com>
Date: Thu, 19 Nov 2020 07:25:44 +0100
Subject: [PATCH] Fix Go Vet string conversion warnings (#185)

https://golang.org/doc/go1.15#vet
---
 attest/tpm.go        | 4 +++-
 attest/win_events.go | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/attest/tpm.go b/attest/tpm.go
index 5586045..b524833 100644
--- a/attest/tpm.go
+++ b/attest/tpm.go
@@ -121,7 +121,9 @@ func readTPM2VendorAttributes(tpm io.ReadWriter) (tpm20Info, error) {
 			return tpm20Info{}, fmt.Errorf("got capability of type %T, want tpm2.TaggedProperty", caps[0])
 		}
 		// Reconstruct the 4 ASCII octets from the uint32 value.
-		vendorInfo += string(subset.Value&0xFF000000) + string(subset.Value&0xFF0000) + string(subset.Value&0xFF00) + string(subset.Value&0xFF)
+		b := make([]byte, 4)
+		binary.BigEndian.PutUint32(b, subset.Value)
+		vendorInfo += string(b)
 	}
 
 	caps, _, err := tpm2.GetCapability(tpm, tpm2.CapabilityTPMProperties, 1, tpmPtManufacturer)
diff --git a/attest/win_events.go b/attest/win_events.go
index b65f0f9..6dba4bc 100644
--- a/attest/win_events.go
+++ b/attest/win_events.go
@@ -636,7 +636,7 @@ func (w *WinEvents) parseUTF16(header microsoftEventHeader, r io.Reader) (string
 	if err := binary.Read(r, binary.LittleEndian, &data); err != nil {
 		return "", err
 	}
-	return strings.TrimSuffix(string(utf16.Decode(data)), string(0x00)), nil
+	return strings.TrimSuffix(string(utf16.Decode(data)), "\x00"), nil
 }
 
 func (w *WinEvents) readELAMAggregation(rdr *bytes.Reader, header microsoftEventHeader) error {