diff --git a/README.md b/README.md index 9579bb17..2741e8d7 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This library is currently pre-1.0 and therefore the API may be subject to breaki - A selection of attestation sources to search for attestation collections ## Documentation -For more detail regarding the library itself, we recommend viewing [pkg.go.dev](https://pkg.go.dev/github.com/testifysec/go-witness). For +For more detail regarding the library itself, we recommend viewing [pkg.go.dev](https://pkg.go.dev/github.com/in-toto/go-witness). For the documentation of the witness project, please view [the main witness repository](https://github.com/in-toto/witness/tree/main/docs). ## Requirements diff --git a/archivista/download.go b/archivista/download.go index 5550d45a..cb6127b8 100644 --- a/archivista/download.go +++ b/archivista/download.go @@ -17,8 +17,8 @@ package archivista import ( "context" - archivistaapi "github.com/testifysec/archivista-api" - "github.com/testifysec/go-witness/dsse" + archivistaapi "github.com/in-toto/archivista/pkg/api" + "github.com/in-toto/go-witness/dsse" ) func (c *Client) Download(ctx context.Context, gitoid string) (dsse.Envelope, error) { diff --git a/archivista/searchgitoids.go b/archivista/searchgitoids.go index 851840dc..f52d5257 100644 --- a/archivista/searchgitoids.go +++ b/archivista/searchgitoids.go @@ -17,7 +17,7 @@ package archivista import ( "context" - archivistaapi "github.com/testifysec/archivista-api" + archivistaapi "github.com/in-toto/archivista/pkg/api" ) type searchGitoidResponse struct { diff --git a/archivista/store.go b/archivista/store.go index 0b6f682a..ccba927a 100644 --- a/archivista/store.go +++ b/archivista/store.go @@ -17,8 +17,8 @@ package archivista import ( "context" - archivistaapi "github.com/testifysec/archivista-api" - "github.com/testifysec/go-witness/dsse" + archivistaapi "github.com/in-toto/archivista/pkg/api" + "github.com/in-toto/go-witness/dsse" ) func (c *Client) Store(ctx context.Context, env dsse.Envelope) (string, error) { diff --git a/attestation/aws-iid/aws-iid.go b/attestation/aws-iid/aws-iid.go index 874fbd6d..a9bd0a6f 100644 --- a/attestation/aws-iid/aws-iid.go +++ b/attestation/aws-iid/aws-iid.go @@ -27,9 +27,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" ) const ( @@ -42,8 +42,8 @@ const ( const ( docPath = "instance-identity/document" sigPath = "instance-identity/signature" - //https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verify-signature.html - //The following AWS public certificate is for all AWS Regions, except Hong Kong, Bahrain, China, and GovCloud. + // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verify-signature.html + // The following AWS public certificate is for all AWS Regions, except Hong Kong, Bahrain, China, and GovCloud. awsCACertPEM = `-----BEGIN CERTIFICATE----- MIIDIjCCAougAwIBAgIJAKnL4UEDMN/FMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV BAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdTZWF0dGxlMRgw diff --git a/attestation/aws-iid/aws-iid_test.go b/attestation/aws-iid/aws-iid_test.go index 13cb45f3..bcda075b 100644 --- a/attestation/aws-iid/aws-iid_test.go +++ b/attestation/aws-iid/aws-iid_test.go @@ -24,9 +24,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" ) const iid = `{ diff --git a/attestation/collection.go b/attestation/collection.go index 2697a81e..9add8895 100644 --- a/attestation/collection.go +++ b/attestation/collection.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/cryptoutil" ) const CollectionType = "https://witness.testifysec.com/attestation-collection/v0.1" diff --git a/attestation/commandrun/commandrun.go b/attestation/commandrun/commandrun.go index ff6675c6..5379700e 100644 --- a/attestation/commandrun/commandrun.go +++ b/attestation/commandrun/commandrun.go @@ -20,9 +20,9 @@ import ( "os" "os/exec" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/environment" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/environment" + "github.com/in-toto/go-witness/cryptoutil" ) const ( diff --git a/attestation/commandrun/tracing_linux.go b/attestation/commandrun/tracing_linux.go index e9cce1bd..53d20d3d 100644 --- a/attestation/commandrun/tracing_linux.go +++ b/attestation/commandrun/tracing_linux.go @@ -26,10 +26,10 @@ import ( "strconv" "strings" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/environment" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/environment" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" "golang.org/x/sys/unix" ) diff --git a/attestation/commandrun/tracing_unsupported.go b/attestation/commandrun/tracing_unsupported.go index 23023c72..55353dc1 100644 --- a/attestation/commandrun/tracing_unsupported.go +++ b/attestation/commandrun/tracing_unsupported.go @@ -20,7 +20,7 @@ import ( "errors" "os/exec" - "github.com/testifysec/go-witness/attestation" + "github.com/in-toto/go-witness/attestation" ) func enableTracing(c *exec.Cmd) { diff --git a/attestation/context.go b/attestation/context.go index d0e1a455..748829c5 100644 --- a/attestation/context.go +++ b/attestation/context.go @@ -21,8 +21,8 @@ import ( "os" "time" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" ) type RunType string diff --git a/attestation/environment/environment.go b/attestation/environment/environment.go index e27d056b..bb3e3d96 100644 --- a/attestation/environment/environment.go +++ b/attestation/environment/environment.go @@ -20,7 +20,7 @@ import ( "runtime" "strings" - "github.com/testifysec/go-witness/attestation" + "github.com/in-toto/go-witness/attestation" ) const ( diff --git a/attestation/environment/environment_test.go b/attestation/environment/environment_test.go index 7a86ef58..b958cd32 100644 --- a/attestation/environment/environment_test.go +++ b/attestation/environment/environment_test.go @@ -18,8 +18,8 @@ import ( "os" "testing" + "github.com/in-toto/go-witness/attestation" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/attestation" ) func TestEnvironment(t *testing.T) { diff --git a/attestation/factory.go b/attestation/factory.go index ef50a60c..abc0bb4d 100644 --- a/attestation/factory.go +++ b/attestation/factory.go @@ -17,8 +17,8 @@ package attestation import ( "fmt" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/registry" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/registry" ) var ( diff --git a/attestation/file/file.go b/attestation/file/file.go index 4b648c7f..40752b28 100644 --- a/attestation/file/file.go +++ b/attestation/file/file.go @@ -21,8 +21,8 @@ import ( "path/filepath" "github.com/edwarnicke/gitoid" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" ) // recordArtifacts will walk basePath and record the digests of each file with each of the functions in hashes. diff --git a/attestation/file/file_test.go b/attestation/file/file_test.go index a4269bf1..9f4dc0da 100644 --- a/attestation/file/file_test.go +++ b/attestation/file/file_test.go @@ -20,8 +20,8 @@ import ( "path/filepath" "testing" + "github.com/in-toto/go-witness/cryptoutil" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/cryptoutil" ) func TestBrokenSymlink(t *testing.T) { diff --git a/attestation/gcp-iit/gcp-iit.go b/attestation/gcp-iit/gcp-iit.go index c2cdfdbd..84ea433d 100644 --- a/attestation/gcp-iit/gcp-iit.go +++ b/attestation/gcp-iit/gcp-iit.go @@ -22,10 +22,10 @@ import ( "net/url" "strings" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/jwt" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/jwt" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/attestation/git/git.go b/attestation/git/git.go index 2978b4d7..1a92634e 100644 --- a/attestation/git/git.go +++ b/attestation/git/git.go @@ -23,8 +23,8 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" ) const ( diff --git a/attestation/git/git_test.go b/attestation/git/git_test.go index c4d93dc4..30c06944 100644 --- a/attestation/git/git_test.go +++ b/attestation/git/git_test.go @@ -26,8 +26,8 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" + "github.com/in-toto/go-witness/attestation" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/attestation" ) func TestNew(t *testing.T) { diff --git a/attestation/github/github.go b/attestation/github/github.go index cece9c0c..c768e3b7 100644 --- a/attestation/github/github.go +++ b/attestation/github/github.go @@ -26,10 +26,10 @@ import ( "strings" "github.com/davecgh/go-spew/spew" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/jwt" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/jwt" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" ) const ( diff --git a/attestation/gitlab/gitlab.go b/attestation/gitlab/gitlab.go index 5d6c1a80..b9663b0a 100644 --- a/attestation/gitlab/gitlab.go +++ b/attestation/gitlab/gitlab.go @@ -20,10 +20,10 @@ import ( "os" "strings" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/jwt" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/jwt" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" ) const ( diff --git a/attestation/jwt/jwt.go b/attestation/jwt/jwt.go index 56952543..1eb2ca12 100644 --- a/attestation/jwt/jwt.go +++ b/attestation/jwt/jwt.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "github.com/testifysec/go-witness/attestation" + "github.com/in-toto/go-witness/attestation" "gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2/jwt" ) diff --git a/attestation/material/material.go b/attestation/material/material.go index 84394d33..458515a1 100644 --- a/attestation/material/material.go +++ b/attestation/material/material.go @@ -17,9 +17,9 @@ package material import ( "encoding/json" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/file" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/file" + "github.com/in-toto/go-witness/cryptoutil" ) const ( diff --git a/attestation/maven/maven.go b/attestation/maven/maven.go index 985b4ab1..9e50034d 100644 --- a/attestation/maven/maven.go +++ b/attestation/maven/maven.go @@ -21,9 +21,9 @@ import ( "io" "os" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" ) const ( diff --git a/attestation/maven/maven_test.go b/attestation/maven/maven_test.go index ab1df6b9..9934433e 100644 --- a/attestation/maven/maven_test.go +++ b/attestation/maven/maven_test.go @@ -19,9 +19,9 @@ import ( "path/filepath" "testing" + "github.com/in-toto/go-witness/attestation" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/attestation" ) func writeTempPomXml(t *testing.T) (string, error) { diff --git a/attestation/oci/oci.go b/attestation/oci/oci.go index f16569af..0f6dcb93 100644 --- a/attestation/oci/oci.go +++ b/attestation/oci/oci.go @@ -26,9 +26,9 @@ import ( "os" "strings" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" ) const ( diff --git a/attestation/oci/oci_test.go b/attestation/oci/oci_test.go index 4b75a125..faca7495 100644 --- a/attestation/oci/oci_test.go +++ b/attestation/oci/oci_test.go @@ -20,9 +20,9 @@ import ( "os" "testing" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" ) type testProducter struct { diff --git a/attestation/product/product.go b/attestation/product/product.go index 3ef24571..1754d841 100644 --- a/attestation/product/product.go +++ b/attestation/product/product.go @@ -24,10 +24,10 @@ import ( "path/filepath" "github.com/gobwas/glob" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/file" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/registry" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/file" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/registry" ) const ( diff --git a/attestation/product/product_test.go b/attestation/product/product_test.go index 76502b74..21aead8a 100644 --- a/attestation/product/product_test.go +++ b/attestation/product/product_test.go @@ -23,10 +23,10 @@ import ( "strings" "testing" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" ) func TestFromDigestMap(t *testing.T) { diff --git a/attestation/sarif/sarif.go b/attestation/sarif/sarif.go index 8c21d8ca..1dac7d87 100644 --- a/attestation/sarif/sarif.go +++ b/attestation/sarif/sarif.go @@ -21,10 +21,10 @@ import ( "os" "strings" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" "github.com/owenrumney/go-sarif/sarif" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" ) const ( diff --git a/dsse/dsse_test.go b/dsse/dsse_test.go index 1df34b3f..7a63e251 100644 --- a/dsse/dsse_test.go +++ b/dsse/dsse_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" + "github.com/in-toto/go-witness/cryptoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/cryptoutil" ) func createRsaKey() (*rsa.PrivateKey, *rsa.PublicKey, error) { diff --git a/dsse/sign.go b/dsse/sign.go index 570934a3..25b958ec 100644 --- a/dsse/sign.go +++ b/dsse/sign.go @@ -21,7 +21,7 @@ import ( "fmt" "io" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/cryptoutil" ) type Timestamper interface { diff --git a/dsse/verify.go b/dsse/verify.go index f1a90393..b74c24ed 100644 --- a/dsse/verify.go +++ b/dsse/verify.go @@ -21,7 +21,7 @@ import ( "io" "time" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/cryptoutil" ) type TimestampVerifier interface { diff --git a/go.mod b/go.mod index 6d6c876c..f112ab8d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/testifysec/go-witness +module github.com/in-toto/go-witness go 1.19 @@ -8,12 +8,12 @@ require ( github.com/digitorus/timestamp v0.0.0-20230220124323-d542479a2425 github.com/edwarnicke/gitoid v0.0.0-20220710194850-1be5bfda1f9d github.com/go-git/go-git/v5 v5.5.2 + github.com/in-toto/archivista v0.1.3-0.20231214050507-e28a4170a9fe github.com/mattn/go-isatty v0.0.20 github.com/open-policy-agent/opa v0.49.2 github.com/owenrumney/go-sarif v1.1.1 github.com/spiffe/go-spiffe/v2 v2.1.6 github.com/stretchr/testify v1.8.4 - github.com/testifysec/archivista-api v0.0.0-20230220215059-632b84b82b76 go.step.sm/crypto v0.25.2 golang.org/x/sys v0.13.0 google.golang.org/grpc v1.56.3 @@ -28,7 +28,7 @@ require ( github.com/coreos/go-oidc/v3 v3.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/go-jose/go-jose/v3 v3.0.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/logr v1.2.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/flatbuffers v2.0.8+incompatible // indirect github.com/google/go-containerregistry v0.13.0 // indirect @@ -50,9 +50,9 @@ require ( github.com/tchap/go-patricia/v2 v2.3.1 // indirect github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect github.com/zclconf/go-cty v1.12.1 // indirect - golang.org/x/mod v0.8.0 // indirect + golang.org/x/mod v0.10.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/tools v0.6.0 // indirect + golang.org/x/tools v0.9.3 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect k8s.io/klog/v2 v2.90.0 // indirect @@ -103,3 +103,5 @@ replace github.com/sigstore/rekor => github.com/testifysec/rekor v0.4.0-dsse-int replace github.com/gin-gonic/gin v1.5.0 => github.com/gin-gonic/gin v1.7.7 replace github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 + +replace github.com/in-toto/archivista v0.1.3-0.20231213123840-c6750e051f5c => github.com/in-toto/archivista v0.1.3-0.20231214050507-e28a4170a9fe diff --git a/go.sum b/go.sum index dea9197c..72feb1d1 100644 --- a/go.sum +++ b/go.sum @@ -74,8 +74,8 @@ github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxF github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-rod/rod v0.112.6 h1:zMirUmhsBeshMWyf285BD0UGtGq54HfThLDGSjcP3lU= github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= @@ -110,6 +110,8 @@ github.com/honeycombio/beeline-go v1.10.0 h1:cUDe555oqvw8oD76BQJ8alk7FP0JZ/M/zXp github.com/honeycombio/libhoney-go v1.16.0 h1:kPpqoz6vbOzgp7jC6SR7SkNj7rua7rgxvznI6M3KdHc= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/in-toto/archivista v0.1.3-0.20231214050507-e28a4170a9fe h1:SNafk19rV7gMlu3YyFuVkj/9vsXnMp6yrFMXDguT3fE= +github.com/in-toto/archivista v0.1.3-0.20231214050507-e28a4170a9fe/go.mod h1:AJU7zhcITsaufiqYMFPLZM66/vwmHVQtZeC2/JFxw7w= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= @@ -179,7 +181,7 @@ github.com/sigstore/fulcio v1.1.0/go.mod h1:zv1ZQTXZbUwQdRwajlQksc34pRas+2aZYpIZ github.com/sigstore/sigstore v1.5.2 h1:rvZSPJDH2ysoc8kjW9v4nv1UX3XwSA8y4x6Dk7hA0D4= github.com/sigstore/sigstore v1.5.2/go.mod h1:wxhp9KoaOpeb1VLKILruD283KJqPSqX+3TuBByVDZ6E= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= @@ -198,16 +200,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes= github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= -github.com/testifysec/archivista-api v0.0.0-20230220215059-632b84b82b76 h1:GAUgHyg4ss2DDTIYG9RuVxap2smkAGtzpXcOvNxlLic= -github.com/testifysec/archivista-api v0.0.0-20230220215059-632b84b82b76/go.mod h1:6OYeTa1OOoVuqo9i8t6GAHtwg0CgofZVfwgVt7DgrwI= github.com/theupdateframework/go-tuf v0.5.2-0.20220930112810-3890c1e7ace4 h1:1i/Afw3rmaR1gF3sfVkG2X6ldkikQwA9zY380LrR5YI= github.com/theupdateframework/go-tuf v0.5.2-0.20220930112810-3890c1e7ace4/go.mod h1:vAqWV3zEs89byeFsAYoh/Q14vJTgJkHwnnRCWBBBINY= github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0= github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= -github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= +github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= @@ -245,8 +245,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -270,7 +270,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -316,8 +316,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/imports.go b/imports.go index 1fa4afee..3736edf3 100644 --- a/imports.go +++ b/imports.go @@ -17,21 +17,21 @@ package witness // all of the following imports are here so that each of the package's init functions run appropriately import ( // attestors - _ "github.com/testifysec/go-witness/attestation/aws-iid" - _ "github.com/testifysec/go-witness/attestation/commandrun" - _ "github.com/testifysec/go-witness/attestation/environment" - _ "github.com/testifysec/go-witness/attestation/gcp-iit" - _ "github.com/testifysec/go-witness/attestation/git" - _ "github.com/testifysec/go-witness/attestation/github" - _ "github.com/testifysec/go-witness/attestation/gitlab" - _ "github.com/testifysec/go-witness/attestation/jwt" - _ "github.com/testifysec/go-witness/attestation/maven" - _ "github.com/testifysec/go-witness/attestation/oci" - _ "github.com/testifysec/go-witness/attestation/sarif" + _ "github.com/in-toto/go-witness/attestation/aws-iid" + _ "github.com/in-toto/go-witness/attestation/commandrun" + _ "github.com/in-toto/go-witness/attestation/environment" + _ "github.com/in-toto/go-witness/attestation/gcp-iit" + _ "github.com/in-toto/go-witness/attestation/git" + _ "github.com/in-toto/go-witness/attestation/github" + _ "github.com/in-toto/go-witness/attestation/gitlab" + _ "github.com/in-toto/go-witness/attestation/jwt" + _ "github.com/in-toto/go-witness/attestation/maven" + _ "github.com/in-toto/go-witness/attestation/oci" + _ "github.com/in-toto/go-witness/attestation/sarif" // signer providers - _ "github.com/testifysec/go-witness/signer/file" - _ "github.com/testifysec/go-witness/signer/fulcio" - _ "github.com/testifysec/go-witness/signer/spiffe" - _ "github.com/testifysec/go-witness/signer/vault" + _ "github.com/in-toto/go-witness/signer/file" + _ "github.com/in-toto/go-witness/signer/fulcio" + _ "github.com/in-toto/go-witness/signer/spiffe" + _ "github.com/in-toto/go-witness/signer/vault" ) diff --git a/intoto/statement.go b/intoto/statement.go index ee84ff63..6574276e 100644 --- a/intoto/statement.go +++ b/intoto/statement.go @@ -16,11 +16,14 @@ package intoto import ( "encoding/json" - "github.com/testifysec/go-witness/cryptoutil" + + "github.com/in-toto/go-witness/cryptoutil" ) -const StatementType = "https://in-toto.io/Statement/v0.1" -const PayloadType = "application/vnd.in-toto+json" +const ( + StatementType = "https://in-toto.io/Statement/v0.1" + PayloadType = "application/vnd.in-toto+json" +) type Subject struct { Name string `json:"name"` diff --git a/policy/constraints.go b/policy/constraints.go index d1a5ebf0..b9f92627 100644 --- a/policy/constraints.go +++ b/policy/constraints.go @@ -18,7 +18,7 @@ import ( "fmt" "net/url" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/cryptoutil" ) const ( diff --git a/policy/constraints_test.go b/policy/constraints_test.go index 3afd5cba..83afab6a 100644 --- a/policy/constraints_test.go +++ b/policy/constraints_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" + "github.com/in-toto/go-witness/cryptoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/cryptoutil" ) type checkConstraintAttributeCase struct { diff --git a/policy/errors.go b/policy/errors.go index 5b4dc8ad..88f1800b 100644 --- a/policy/errors.go +++ b/policy/errors.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/cryptoutil" ) type ErrNoAttestations string diff --git a/policy/policy.go b/policy/policy.go index b6456b1f..3eddcd94 100644 --- a/policy/policy.go +++ b/policy/policy.go @@ -20,10 +20,10 @@ import ( "crypto/x509" "time" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" - "github.com/testifysec/go-witness/source" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" + "github.com/in-toto/go-witness/source" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/policy/policy_test.go b/policy/policy_test.go index 6e767a20..6b5af3ac 100644 --- a/policy/policy_test.go +++ b/policy/policy_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/commandrun" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/intoto" + "github.com/in-toto/go-witness/source" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/commandrun" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/intoto" - "github.com/testifysec/go-witness/source" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/policy/rego.go b/policy/rego.go index 6a436399..51e71e81 100644 --- a/policy/rego.go +++ b/policy/rego.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" + "github.com/in-toto/go-witness/attestation" "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/rego" - "github.com/testifysec/go-witness/attestation" ) func EvaluateRegoPolicy(attestor attestation.Attestor, policies []RegoPolicy) error { diff --git a/policy/rego_test.go b/policy/rego_test.go index 3ae3d373..ab767e9e 100644 --- a/policy/rego_test.go +++ b/policy/rego_test.go @@ -17,9 +17,9 @@ package policy import ( "testing" + "github.com/in-toto/go-witness/attestation/git" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/attestation/git" ) func TestRegoPolicy(t *testing.T) { diff --git a/policy/step.go b/policy/step.go index 15a54001..b1b63ef0 100644 --- a/policy/step.go +++ b/policy/step.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/source" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/source" ) // +kubebuilder:object:generate=true diff --git a/run.go b/run.go index d9c489b3..b6ccd2ca 100644 --- a/run.go +++ b/run.go @@ -19,12 +19,12 @@ import ( "encoding/json" "fmt" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/attestation/environment" - "github.com/testifysec/go-witness/attestation/git" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/dsse" - "github.com/testifysec/go-witness/intoto" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/attestation/environment" + "github.com/in-toto/go-witness/attestation/git" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/dsse" + "github.com/in-toto/go-witness/intoto" ) type runOptions struct { diff --git a/sign.go b/sign.go index 8f10a028..c2d0a58e 100644 --- a/sign.go +++ b/sign.go @@ -18,7 +18,7 @@ import ( "encoding/json" "io" - "github.com/testifysec/go-witness/dsse" + "github.com/in-toto/go-witness/dsse" ) func Sign(r io.Reader, dataType string, w io.Writer, opts ...dsse.SignOption) error { diff --git a/signer/file/file.go b/signer/file/file.go index 95256daa..f76d8116 100644 --- a/signer/file/file.go +++ b/signer/file/file.go @@ -20,9 +20,9 @@ import ( "fmt" "os" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/registry" - "github.com/testifysec/go-witness/signer" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/registry" + "github.com/in-toto/go-witness/signer" ) func init() { diff --git a/signer/fulcio/fulcio.go b/signer/fulcio/fulcio.go index 449e7553..ff628ecc 100644 --- a/signer/fulcio/fulcio.go +++ b/signer/fulcio/fulcio.go @@ -31,16 +31,16 @@ import ( "strings" "time" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/log" + "github.com/in-toto/go-witness/registry" + "github.com/in-toto/go-witness/signer" "github.com/mattn/go-isatty" fulciopb "github.com/sigstore/fulcio/pkg/generated/protobuf" "github.com/sigstore/sigstore/pkg/cryptoutils" "github.com/sigstore/sigstore/pkg/oauthflow" "github.com/sigstore/sigstore/pkg/signature" sigo "github.com/sigstore/sigstore/pkg/signature/options" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/log" - "github.com/testifysec/go-witness/registry" - "github.com/testifysec/go-witness/signer" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/signer/registry.go b/signer/registry.go index a445df31..3c828fde 100644 --- a/signer/registry.go +++ b/signer/registry.go @@ -17,13 +17,11 @@ package signer import ( "context" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/registry" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/registry" ) -var ( - signerRegistry = registry.New[SignerProvider]() -) +var signerRegistry = registry.New[SignerProvider]() type SignerProvider interface { Signer(context.Context) (cryptoutil.Signer, error) diff --git a/signer/spiffe/spiffe.go b/signer/spiffe/spiffe.go index ee76fe6e..34d708e6 100644 --- a/signer/spiffe/spiffe.go +++ b/signer/spiffe/spiffe.go @@ -18,10 +18,10 @@ import ( "context" "fmt" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/registry" + "github.com/in-toto/go-witness/signer" "github.com/spiffe/go-spiffe/v2/workloadapi" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/registry" - "github.com/testifysec/go-witness/signer" ) func init() { diff --git a/signer/vault/signerprovider.go b/signer/vault/signerprovider.go index 27ec65c6..c6a19da3 100644 --- a/signer/vault/signerprovider.go +++ b/signer/vault/signerprovider.go @@ -21,9 +21,9 @@ import ( "strings" "time" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/registry" - "github.com/testifysec/go-witness/signer" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/registry" + "github.com/in-toto/go-witness/signer" ) const ( diff --git a/signer/vault/signerprovider_test.go b/signer/vault/signerprovider_test.go index c5a2f007..39c44e74 100644 --- a/signer/vault/signerprovider_test.go +++ b/signer/vault/signerprovider_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" + "github.com/in-toto/go-witness/cryptoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/cryptoutil" ) func createRsaKey() (*rsa.PrivateKey, *rsa.PublicKey, error) { diff --git a/source/archivista.go b/source/archivista.go index 66c4ec32..2f74f722 100644 --- a/source/archivista.go +++ b/source/archivista.go @@ -17,7 +17,7 @@ package source import ( "context" - "github.com/testifysec/go-witness/archivista" + "github.com/in-toto/go-witness/archivista" ) type ArchivistaSource struct { diff --git a/source/memory.go b/source/memory.go index df6e5609..8f7450e7 100644 --- a/source/memory.go +++ b/source/memory.go @@ -21,7 +21,7 @@ import ( "io" "os" - "github.com/testifysec/go-witness/dsse" + "github.com/in-toto/go-witness/dsse" ) type ErrDuplicateReference string diff --git a/source/source.go b/source/source.go index 7ebd5e41..1aad2bbd 100644 --- a/source/source.go +++ b/source/source.go @@ -18,9 +18,9 @@ import ( "context" "encoding/json" - "github.com/testifysec/go-witness/attestation" - "github.com/testifysec/go-witness/dsse" - "github.com/testifysec/go-witness/intoto" + "github.com/in-toto/go-witness/attestation" + "github.com/in-toto/go-witness/dsse" + "github.com/in-toto/go-witness/intoto" ) type CollectionEnvelope struct { diff --git a/source/verified.go b/source/verified.go index 0bbc0058..46fc561e 100644 --- a/source/verified.go +++ b/source/verified.go @@ -17,9 +17,9 @@ package source import ( "context" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/dsse" - "github.com/testifysec/go-witness/log" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/dsse" + "github.com/in-toto/go-witness/log" ) type VerifiedCollection struct { diff --git a/timestamp/tsp.go b/timestamp/tsp.go index 8e6d1303..e8a1e596 100644 --- a/timestamp/tsp.go +++ b/timestamp/tsp.go @@ -26,7 +26,7 @@ import ( "github.com/digitorus/pkcs7" "github.com/digitorus/timestamp" - "github.com/testifysec/go-witness/cryptoutil" + "github.com/in-toto/go-witness/cryptoutil" ) type TSPTimestamper struct { diff --git a/timestamp/tsp_test.go b/timestamp/tsp_test.go index f9e61757..60698931 100644 --- a/timestamp/tsp_test.go +++ b/timestamp/tsp_test.go @@ -20,9 +20,9 @@ import ( "crypto/x509" "testing" + "github.com/in-toto/go-witness/cryptoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/testifysec/go-witness/cryptoutil" ) const ( diff --git a/verify.go b/verify.go index 857aa09b..bb20df6b 100644 --- a/verify.go +++ b/verify.go @@ -21,11 +21,11 @@ import ( "fmt" "io" - "github.com/testifysec/go-witness/cryptoutil" - "github.com/testifysec/go-witness/dsse" - "github.com/testifysec/go-witness/policy" - "github.com/testifysec/go-witness/source" - "github.com/testifysec/go-witness/timestamp" + "github.com/in-toto/go-witness/cryptoutil" + "github.com/in-toto/go-witness/dsse" + "github.com/in-toto/go-witness/policy" + "github.com/in-toto/go-witness/source" + "github.com/in-toto/go-witness/timestamp" ) func VerifySignature(r io.Reader, verifiers ...cryptoutil.Verifier) (dsse.Envelope, error) {