Internal change

PiperOrigin-RevId: 380881515

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 2
-    
+
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}
 

attest/application_key_test.go

@@ -26,10 +26,11 @@ import (
 	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/rsa"
-	"crypto/x509"
 	"encoding/asn1"
 	"math/big"
 	"testing"
+
+	"github.com/google/certificate-transparency-go/x509"
 )
 
 func TestSimTPM20KeyCreateAndLoad(t *testing.T) {

attest/attest-tool/attest-tool.go

@@ -15,9 +15,9 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/google/certificate-transparency-go/x509"
 	"github.com/google/go-attestation/attest"
 	"github.com/google/go-attestation/attest/attest-tool/internal"
+	"github.com/google/certificate-transparency-go/x509"
 )
 
 var (

attest/challenge_test.go

@@ -4,8 +4,9 @@ import (
 	"bytes"
 	"crypto/rand"
 	"crypto/rsa"
-	"crypto/x509"
 	"testing"
+
+	"github.com/google/certificate-transparency-go/x509"
 )
 
 func TestMakeActivationBlob(t *testing.T) {

attest/eventlog.go

@@ -348,7 +348,7 @@ func (a *AKPublic) validate20Quote(quote Quote, pcrs []PCR, nonce []byte) error
 		return fmt.Errorf("attestation isn't a quote, tag of type 0x%x", att.Type)
 	}
 	if !bytes.Equal([]byte(att.ExtraData), nonce) {
-		return fmt.Errorf("nonce didn't match: %v", err)
+		return fmt.Errorf("nonce = %#v, want %#v", []byte(att.ExtraData), nonce)
 	}
 
 	pcrByIndex := map[int][]byte{}

attest/pcp_windows.go

@@ -26,9 +26,9 @@ import (
 
 	"github.com/google/certificate-transparency-go/x509"
 
-	"github.com/google/go-tpm/tpmutil"
-	tpmtbs "github.com/google/go-tpm/tpmutil/tbs"
 	"golang.org/x/sys/windows"
+	tpmtbs "github.com/google/go-tpm/tpmutil/tbs"
+	"github.com/google/go-tpm/tpmutil"
 )
 
 const (

attest/secureboot.go

@@ -19,8 +19,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/google/certificate-transparency-go/x509"
 	"github.com/google/go-attestation/attest/internal"
+	"github.com/google/certificate-transparency-go/x509"
 )
 
 // SecurebootState describes the secure boot status of a machine, as determined

attest/tpm12_linux.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/google/certificate-transparency-go/x509"
 	"github.com/google/go-tspi/attestation"
-	"github.com/google/go-tspi/tspi"
+	"github.com/Comcast/gotspi/tspi"
-	"github.com/google/go-tspi/tspiconst"
+	"github.com/Comcast/gotspi/tspiconst"
 )
 
 func init() {

attest/tpm_test.go

@@ -2,10 +2,11 @@ package attest
 
 import (
 	"crypto/rsa"
-	"crypto/x509"
 	"encoding/pem"
 	"fmt"
 	"testing"
+
+	"github.com/google/certificate-transparency-go/x509"
 )
 
 // Generated using the following command:

attest/tpm_windows.go

@@ -28,9 +28,9 @@ import (
 	"io"
 	"math/big"
 
+	"golang.org/x/sys/windows"
 	tpm1 "github.com/google/go-tpm/tpm"
 	tpmtbs "github.com/google/go-tpm/tpmutil/tbs"
-	"golang.org/x/sys/windows"
 )
 
 var wellKnownAuth [20]byte

attributecert/attributecert.go

@@ -9,15 +9,15 @@ package attributecert
 import (
 	"bytes"
 	"crypto"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
 	"errors"
 	"fmt"
 	"math/big"
 	"time"
 
 	"github.com/google/go-attestation/oid"
+	"github.com/google/certificate-transparency-go/asn1"
+	"github.com/google/certificate-transparency-go/x509/pkix"
+	"github.com/google/certificate-transparency-go/x509"
 )
 
 var (

attributecert/attributecert_test.go

@@ -15,12 +15,13 @@
 package attributecert
 
 import (
-	"crypto/x509"
 	"encoding/json"
 	"io/ioutil"
 	"reflect"
 	"strings"
 	"testing"
+
+	"github.com/google/certificate-transparency-go/x509"
 )
 
 func TestVerifyAttributeCert(t *testing.T) {
@@ -38,7 +39,7 @@ func TestVerifyAttributeCert(t *testing.T) {
 		t.Fatalf("failed to parse Intel intermediate certificate: %v", err)
 	}
 
-	for _, filename := range(testfiles) {
+	for _, filename := range testfiles {
 		data, err = ioutil.ReadFile(filename)
 		if err != nil {
 			t.Fatalf("failed to read %s: %v", filename, err)

ci/gen_ekcert.go

@@ -3,8 +3,6 @@ package main
 import (
 	"crypto/rand"
 	"crypto/rsa"
-	"crypto/x509"
-	"crypto/x509/pkix"
 	"encoding/binary"
 	"encoding/hex"
 	"flag"
@@ -14,6 +12,9 @@ import (
 	"os/exec"
 	"strings"
 	"time"
+
+	"github.com/google/certificate-transparency-go/x509/pkix"
+	"github.com/google/certificate-transparency-go/x509"
 )
 
 var simulatorStatePath = flag.String("state_path", "/tmp/sim/NVRAM/00.permall", "Path to ibmswtpm state file")

oid/oid.go

@@ -59,4 +59,3 @@ var (
 var (
 	CloudComputeInstanceIdentifier = []int{1, 3, 6, 1, 4, 1, 11129, 2, 1, 21}
 )
-