vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove digest package's dependency on external sha implementation

Browse source 
The change relies on a refactor of the upstream resumable sha256/sha512 package
that opts to register implementations with the standard library. This allows
the resumable support to be detected where it matters, avoiding unnecessary and
complex code. It also ensures that consumers of the digest package don't need
to depend on the forked sha implementations.

We also get an optimization with this change. If the size of data written to a
digester is the same as the file size, we check to see if the digest has been
verified. This works if the blob is written and committed in a single request.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2015-05-20 23:44:08 -07:00
parent 07ff029506
commit eee6cad2cf
32 changed files with 431 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

7
digest/digest.go
View file

@ -2,6 +2,7 @@ package digest
import (
"bytes"
"crypto"
"fmt"
"hash"
"io"
@ -15,8 +16,12 @@ import (
const (
// DigestTarSumV1EmptyTar is the digest for the empty tar file.
DigestTarSumV1EmptyTar = "tarsum.v1+sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
// DigestSha256EmptyTar is the canonical sha256 digest of empty data
DigestSha256EmptyTar = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
CanonicalAlgorithm = "sha256"
CanonicalHash = crypto.SHA256 // main digest algorithm used through distribution
)
// Digest allows simple protection of hex formatted digest strings, prefixed
@ -73,7 +78,7 @@ func ParseDigest(s string) (Digest, error) {
func FromReader(rd io.Reader) (Digest, error) {
digester := NewCanonicalDigester()
if _, err := io.Copy(digester, rd); err != nil {
if _, err := io.Copy(digester.Hash(), rd); err != nil {
return "", err
}