Update dependencies (#5518)

vendor/github.com/google/go-containerregistry/internal/verify/verify.go

@@ -17,9 +17,7 @@
 package verify
 
 import (
-	"bytes"
 	"encoding/hex"
-	"errors"
 	"fmt"
 	"hash"
 	"io"
@@ -28,28 +26,20 @@ import (
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 )
 
-// SizeUnknown is a sentinel value to indicate that the expected size is not known.
-const SizeUnknown = -1
-
 type verifyReader struct {
-	inner             io.Reader
-	hasher            hash.Hash
-	expected          v1.Hash
-	gotSize, wantSize int64
+	inner    io.Reader
+	hasher   hash.Hash
+	expected v1.Hash
 }
 
 // Read implements io.Reader
 func (vc *verifyReader) Read(b []byte) (int, error) {
 	n, err := vc.inner.Read(b)
-	vc.gotSize += int64(n)
 	if err == io.EOF {
-		if vc.wantSize != SizeUnknown && vc.gotSize != vc.wantSize {
-			return n, fmt.Errorf("error verifying size; got %d, want %d", vc.gotSize, vc.wantSize)
-		}
 		got := hex.EncodeToString(vc.hasher.Sum(make([]byte, 0, vc.hasher.Size())))
 		if want := vc.expected.Hex; got != want {
-			return n, fmt.Errorf("error verifying %s checksum after reading %d bytes; got %q, want %q",
-				vc.expected.Algorithm, vc.gotSize, got, want)
+			return n, fmt.Errorf("error verifying %s checksum; got %q, want %q",
+				vc.expected.Algorithm, got, want)
 		}
 	}
 	return n, err
@@ -57,51 +47,18 @@ func (vc *verifyReader) Read(b []byte) (int, error) {
 
 // ReadCloser wraps the given io.ReadCloser to verify that its contents match
 // the provided v1.Hash before io.EOF is returned.
-//
-// The reader will only be read up to size bytes, to prevent resource
-// exhaustion. If EOF is returned before size bytes are read, an error is
-// returned.
-//
-// A size of SizeUnknown (-1) indicates disables size verification when the size
-// is unknown ahead of time.
-func ReadCloser(r io.ReadCloser, size int64, h v1.Hash) (io.ReadCloser, error) {
+func ReadCloser(r io.ReadCloser, h v1.Hash) (io.ReadCloser, error) {
 	w, err := v1.Hasher(h.Algorithm)
 	if err != nil {
 		return nil, err
 	}
-	var r2 io.Reader = r
-	if size != SizeUnknown {
-		r2 = io.LimitReader(io.TeeReader(r, w), size)
-	}
+	r2 := io.TeeReader(r, w)
 	return &and.ReadCloser{
 		Reader: &verifyReader{
 			inner:    r2,
 			hasher:   w,
 			expected: h,
-			wantSize: size,
 		},
 		CloseFunc: r.Close,
 	}, nil
 }
-
-// Descriptor verifies that the embedded Data field matches the Size and Digest
-// fields of the given v1.Descriptor, returning an error if the Data field is
-// missing or if it contains incorrect data.
-func Descriptor(d v1.Descriptor) error {
-	if d.Data == nil {
-		return errors.New("error verifying descriptor; Data == nil")
-	}
-
-	h, sz, err := v1.SHA256(bytes.NewReader(d.Data))
-	if err != nil {
-		return err
-	}
-	if h != d.Digest {
-		return fmt.Errorf("error verifying Digest; got %q, want %q", h, d.Digest)
-	}
-	if sz != d.Size {
-		return fmt.Errorf("error verifying Size; got %d, want %d", sz, d.Size)
-	}
-
-	return nil
-}